--- a/src/node/ethernet-trailer.h	Mon Mar 17 14:01:55 2008 -0700
+++ b/src/node/ethernet-trailer.h	Mon Mar 17 14:49:52 2008 -0700
@@ -39,10 +39,6 @@
 class EthernetTrailer : public Trailer 
 {
 public:
-  static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
-  static uint32_t GetUid (void);
-
   /**
    * \brief Construct a null ethernet trailer
    */
@@ -85,11 +81,12 @@
    */ 
   uint32_t GetTrailerSize() const;
 
-  std::string GetName (void) const;
-  void Print (std::ostream &os) const;
-  uint32_t GetSerializedSize (void) const;
-  void Serialize (Buffer::Iterator end) const;
-  uint32_t Deserialize (Buffer::Iterator end);
+  static TypeId GetTypeId (void);
+  virtual TypeId GetInstanceTypeId (void) const;
+  virtual void Print (std::ostream &os) const;
+  virtual uint32_t GetSerializedSize (void) const;
+  virtual void Serialize (Buffer::Iterator end) const;
+  virtual uint32_t Deserialize (Buffer::Iterator end);
 private:
 
   /**