--- a/src/common/packet.cc	Mon May 18 14:10:49 2009 +0100
+++ b/src/common/packet.cc	Tue May 19 15:34:20 2009 +0200
@@ -469,13 +469,6 @@
 }
 
 void
-Packet::EnableMetadata (void)
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  EnableChecking ();
-}
-
-void
 Packet::EnablePrinting (void)
 {
   NS_LOG_FUNCTION_NOARGS ();

--- a/src/common/packet.h	Mon May 18 14:10:49 2009 +0100
+++ b/src/common/packet.h	Tue May 19 15:34:20 2009 +0200
@@ -321,8 +321,6 @@
 
   PacketMetadata::ItemIterator BeginItem (void) const;
 
-  static void EnableMetadata (void) NS_DEPRECATED;
-
   /**
    * By default, packets do not keep around enough metadata to
    * perform the operations requested by the Print methods. If you

--- a/src/helper/csma-helper.cc	Mon May 18 14:10:49 2009 +0100
+++ b/src/helper/csma-helper.cc	Tue May 19 15:34:20 2009 +0200
@@ -65,18 +65,6 @@
 }
 
 void 
-CsmaHelper::SetDeviceParameter (std::string n1, const AttributeValue &v1)
-{
-  SetDeviceAttribute (n1, v1);
-}
-
-void 
-CsmaHelper::SetChannelParameter (std::string n1, const AttributeValue &v1)
-{
-  SetChannelAttribute (n1, v1);
-}
-
-void 
 CsmaHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid, bool promiscuous)
 {
   std::ostringstream oss;

--- a/src/helper/csma-helper.h	Mon May 18 14:10:49 2009 +0100
+++ b/src/helper/csma-helper.h	Tue May 19 15:34:20 2009 +0200
@@ -80,9 +80,6 @@
    */
   void SetChannelAttribute (std::string n1, const AttributeValue &v1);
 
-  void SetDeviceParameter (std::string n1, const AttributeValue &v1) NS_DEPRECATED;
-  void SetChannelParameter (std::string n1, const AttributeValue &v1) NS_DEPRECATED;
-
   /**
    * \param filename filename prefix to use for pcap files.
    * \param nodeid the id of the node to generate pcap output for.

--- a/src/helper/point-to-point-helper.cc	Mon May 18 14:10:49 2009 +0100
+++ b/src/helper/point-to-point-helper.cc	Tue May 19 15:34:20 2009 +0200
@@ -64,17 +64,6 @@
 }
 
 void 
-PointToPointHelper::SetDeviceParameter (std::string name, const AttributeValue &value)
-{
-  SetDeviceAttribute (name, value);
-}
-void 
-PointToPointHelper::SetChannelParameter (std::string name, const AttributeValue &value)
-{
-  SetChannelAttribute (name, value);
-}
-
-void 
 PointToPointHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid)
 {
   std::ostringstream oss;

--- a/src/helper/point-to-point-helper.h	Mon May 18 14:10:49 2009 +0100
+++ b/src/helper/point-to-point-helper.h	Tue May 19 15:34:20 2009 +0200
@@ -79,9 +79,6 @@
    */
   void SetChannelAttribute (std::string name, const AttributeValue &value);
 
-  void SetDeviceParameter (std::string name, const AttributeValue &value) NS_DEPRECATED;
-  void SetChannelParameter (std::string name, const AttributeValue &value) NS_DEPRECATED;
-
   /**
    * \param filename filename prefix to use for pcap files.
    * \param nodeid the id of the node to generate pcap output for.

--- a/src/simulator/simulator.cc	Mon May 18 14:10:49 2009 +0100
+++ b/src/simulator/simulator.cc	Tue May 19 15:34:20 2009 +0200
@@ -139,10 +139,6 @@
   GetImpl ()->SetScheduler (scheduler);
 }
 
-void 
-Simulator::EnableLogTo (char const *filename)
-{}
-
 bool 
 Simulator::IsFinished (void)
 {

--- a/src/simulator/simulator.h	Mon May 18 14:10:49 2009 +0100
+++ b/src/simulator/simulator.h	Tue May 19 15:34:20 2009 +0200
@@ -82,8 +82,6 @@
    */
   static void SetScheduler (Ptr<Scheduler> scheduler);
 
-  static void EnableLogTo (char const *filename) NS_DEPRECATED;
-
   /**
    * Every event scheduled by the Simulator::insertAtDestroy method is
    * invoked. Then, we ensure that any memory allocated by the