diff --git a/src/core/model/attribute-list.cc b/src/core/model/attribute-list.cc
index 251ccdba8..e22e7e001 100644
--- a/src/core/model/attribute-list.cc
+++ b/src/core/model/attribute-list.cc
@@ -258,60 +258,4 @@ AttributeList::DeserializeFromString (std::string str)
   return true;
 }
 
-UnsafeAttributeList::UnsafeAttributeList ()
-{
-}
-UnsafeAttributeList::UnsafeAttributeList (const UnsafeAttributeList &o)
-{
-  for (uint32_t i = 0; i < o.m_attributes.size (); ++i)
-    {
-      Set (o.m_attributes[i].first, *(o.m_attributes[i].second));
-    }
-}
-UnsafeAttributeList &
-UnsafeAttributeList::operator = (const UnsafeAttributeList &o)
-{
-  m_attributes.clear ();
-  for (uint32_t i = 0; i < o.m_attributes.size (); ++i)
-    {
-      Set (o.m_attributes[i].first, *(o.m_attributes[i].second));
-    }
-  return *this;
-}
-
-UnsafeAttributeList::~UnsafeAttributeList ()
-{
-  m_attributes.clear ();
-}
-void 
-UnsafeAttributeList::Set (std::string name, const AttributeValue &param)
-{
-  if (name == "")
-    {
-      return;
-    }
-  for (uint32_t i = 0; i < m_attributes.size (); ++i)
-    {
-      if (m_attributes[i].first == name)
-        {
-          m_attributes[i].second = param.Copy ();
-          return;
-        }
-    }
-  m_attributes.push_back (std::make_pair (name, param.Copy ()));
-}
-
-AttributeList 
-UnsafeAttributeList::GetSafe (std::string tidName) const
-{
-  AttributeList list;
-  for (uint32_t i = 0; i < m_attributes.size (); ++i)
-    {
-      TypeId tid = TypeId::LookupByName (tidName);
-      list.SetWithTid (tid, m_attributes[i].first, *m_attributes[i].second);
-    }
-  return list;
-}
-
-
 } // namespace ns3
diff --git a/src/core/model/attribute-list.h b/src/core/model/attribute-list.h
index 00ee0b3e0..be2583f43 100644
--- a/src/core/model/attribute-list.h
+++ b/src/core/model/attribute-list.h
@@ -108,21 +108,6 @@ private:
   Attrs m_attributes;
 };
 
-class UnsafeAttributeList
-{
-public:
-  UnsafeAttributeList ();
-  UnsafeAttributeList (const UnsafeAttributeList &o);
-  UnsafeAttributeList &operator = (const UnsafeAttributeList &o);
-  ~UnsafeAttributeList ();
-
-  void Set (std::string name, const AttributeValue &param);
-
-  AttributeList GetSafe (std::string name) const;
-private:
-  std::vector<std::pair<std::string,Ptr<AttributeValue> > > m_attributes;
-};
-
 } // namespace ns3
 
 #endif /* ATTRIBUTE_LIST_H */