--- a/src/node/node.cc	Wed Feb 27 19:51:34 2008 +0100
+++ b/src/node/node.cc	Wed Feb 27 20:23:57 2008 +0100
@@ -55,64 +55,6 @@
   return tid;
 }
 
-NodeNetDeviceIndex::NodeNetDeviceIndex ()
-  : m_index (0)
-{}
-NodeNetDeviceIndex::NodeNetDeviceIndex (uint32_t index)
-  : m_index (index)
-{}
-uint32_t 
-NodeNetDeviceIndex::Get (void) const
-{
-  return m_index;
-}
-void 
-NodeNetDeviceIndex::Print (std::ostream &os) const
-{
-  os << "device=" << m_index;
-}
-uint16_t 
-NodeNetDeviceIndex::GetUid (void)
-{
-  static uint16_t uid = AllocateUid<NodeNetDeviceIndex> ("NodeNetDeviceIndex");
-  return uid;
-}
-std::string 
-NodeNetDeviceIndex::GetTypeName (void) const
-{
-  return "ns3::NodeNetDeviceIndex";
-}
-
-
-NodeApplicationIndex::NodeApplicationIndex ()
-  : m_index (0)
-{}
-NodeApplicationIndex::NodeApplicationIndex (uint32_t index)
-  : m_index (index)
-{}
-uint32_t 
-NodeApplicationIndex::Get (void) const
-{
-  return m_index;
-}
-void 
-NodeApplicationIndex::Print (std::ostream &os) const
-{
-  os << "device=" << m_index;
-}
-uint16_t 
-NodeApplicationIndex::GetUid (void)
-{
-  static uint16_t uid = AllocateUid<NodeApplicationIndex> ("NodeApplicationIndex");
-  return uid;
-}
-std::string 
-NodeApplicationIndex::GetTypeName (void) const
-{
-  return "ns3::NodeApplicationIndex";
-}
-
-
 Node::Node()
   : m_id(0), 
     m_sid(0)
@@ -138,16 +80,6 @@
 Node::~Node ()
 {}
 
-Ptr<TraceResolver>
-Node::GetTraceResolver (void) const
-{
-  Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
-  resolver->AddArray ("devices", m_devices.begin (), m_devices.end (), NodeNetDeviceIndex ());
-  resolver->AddArray ("applications", m_applications.begin (), m_applications.end (), NodeApplicationIndex ());
-  resolver->SetParentResolver (Object::GetTraceResolver ());
-  return resolver;
-}
-
 uint32_t 
 Node::GetId (void) const
 {