--- a/src/devices/wifi/mgt-headers.cc	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/devices/wifi/mgt-headers.cc	Mon Mar 17 14:49:52 2008 -0700
@@ -74,17 +74,6 @@
 {
   return GetTypeId ();
 }
-uint32_t
-MgtProbeRequestHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<MgtProbeRequestHeader> ("MgtProbeRequestHeader.ns3.inria.fr");
-  return uid;
-}
-std::string
-MgtProbeRequestHeader::GetName (void) const
-{
-  return "PROBEREQ";
-}
 void 
 MgtProbeRequestHeader::Print (std::ostream &os) const
 {
@@ -164,17 +153,6 @@
   return GetTypeId ();
 }
 uint32_t
-MgtProbeResponseHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<MgtProbeResponseHeader> ("MgtProbeResponseHeader.ns3.inria.fr");
-  return uid;
-}
-std::string
-MgtProbeResponseHeader::GetName (void) const
-{
-  return "PROBERESP";
-}
-uint32_t
 MgtProbeResponseHeader::GetSerializedSize (void) const
 {
   uint32_t size = 0;
@@ -283,17 +261,6 @@
 {
   return GetTypeId ();
 }
-uint32_t
-MgtAssocRequestHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<MgtAssocRequestHeader> ("MgtAssocRequestHeader.ns3.inria.fr");
-  return uid;
-}
-std::string
-MgtAssocRequestHeader::GetName (void) const
-{
-  return "ASSOCREQ";
-}
 uint32_t 
 MgtAssocRequestHeader::GetSerializedSize (void) const
 {
@@ -376,17 +343,6 @@
   return GetTypeId ();
 }
 uint32_t
-MgtAssocResponseHeader::GetUid (void)
-{
-  static uint32_t uid = AllocateUid<MgtAssocResponseHeader> ("MgtAssocResponseHeader.ns3.inria.fr");
-  return uid;
-}
-std::string
-MgtAssocResponseHeader::GetName (void) const
-{
-  return "ASSOCRESP";
-}
-uint32_t
 MgtAssocResponseHeader::GetSerializedSize (void) const
 {
   uint32_t size = 0;