--- a/src/devices/lte/model/enb-mac-entity.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/enb-mac-entity.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -60,6 +60,7 @@
 {
   m_downlinkScheduler = 0;
   m_uplinkScheduler = 0;
+  MacEntity::DoDispose ();
 }
 
 

--- a/src/devices/lte/model/enb-net-device.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/enb-net-device.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -84,6 +84,7 @@
   NS_LOG_FUNCTION (this);
   m_ueManager = 0;
   m_macEntity = 0;
+  LteNetDevice::DoDispose ();
 }
 
 void

--- a/src/devices/lte/model/ideal-control-messages.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/ideal-control-messages.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -109,7 +109,7 @@
 
 PdcchMapIdealControlMessage::~PdcchMapIdealControlMessage (void)
 {
-  m_idealPdcchMessage = 0;
+ delete  m_idealPdcchMessage;
 }
 
 
@@ -152,7 +152,7 @@
 
 CqiIdealControlMessage::~CqiIdealControlMessage (void)
 {
-  m_cqiFeedbacks = 0;
+  delete m_cqiFeedbacks;
 }
 
 

--- a/src/devices/lte/model/lte-net-device.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/lte-net-device.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -70,16 +70,13 @@
 {
   NS_LOG_FUNCTION (this);
   m_rrcEntity = CreateObject<RrcEntity> ();
-  //m_rlcEntity = CreateObject<RlcEntity> ();
 }
 
 
 LteNetDevice::~LteNetDevice (void)
 {
   NS_LOG_FUNCTION (this);
-
   m_rrcEntity = 0;
-  //m_rlcEntity = 0;
 }
 
 
@@ -92,7 +89,6 @@
   m_phy = 0;
   m_node = 0;
   m_rrcEntity = 0;
-  //m_rlcEntity = 0;
   m_phyMacTxStartCallback = MakeNullCallback< bool, Ptr<Packet> > ();
   NetDevice::DoDispose ();
 }

--- a/src/devices/lte/model/mac-entity.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/mac-entity.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -54,6 +54,12 @@
   m_device = 0;
 }
 
+void 
+MacEntity::DoDispose (void)
+{
+  m_amcModule = 0;
+  m_device = 0;
+}
 
 void
 MacEntity::SetDevice (Ptr<LteNetDevice> d)

--- a/src/devices/lte/model/mac-entity.h	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/mac-entity.h	Mon Dec 20 17:12:50 2010 +0100
@@ -42,6 +42,8 @@
   MacEntity (void);
   virtual ~MacEntity (void);
 
+  virtual void DoDispose (void);
+
   /** 
    * \brief Set the device where the mac entity is attached
    * \param d the device

--- a/src/devices/lte/model/multipath-loss-model.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/multipath-loss-model.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -79,9 +79,9 @@
 
 JakesFadingLossModel::~JakesFadingLossModel ()
 {
-  m_multipath = 0;
-  m_nbOfPaths = 0;
-  m_startJakes = 0;
+ delete  m_multipath;
+ delete  m_nbOfPaths;
+ delete  m_startJakes;
 }
 
 

--- a/src/devices/lte/model/radio-bearer-instance.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/radio-bearer-instance.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -58,6 +58,9 @@
 
 RadioBearerInstance::~RadioBearerInstance ()
 {
+  m_rlcEntity = 0;
+  m_queue = 0;
+  m_ipcsClassifierRecord = 0;
 }
 
 void

--- a/src/devices/lte/model/rrc-entity.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/rrc-entity.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -64,6 +64,7 @@
   delete m_downlinkNgbrBearersContainer;
   delete m_uplinkGbrBearersContainer;
   delete m_uplinkNgbrBearersContainer;
+  m_defaultBearer = 0;
 }
 
 void

--- a/src/devices/lte/model/shadowing-loss-model.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/shadowing-loss-model.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -60,6 +60,7 @@
 
 ShadowingLossModel::~ShadowingLossModel ()
 {
+  delete m_randVariable;
 }
 
 

--- a/src/devices/lte/model/simple-packet-scheduler.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/simple-packet-scheduler.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -141,6 +141,8 @@
 
    GetMacEntity ()->GetObject<EnbMacEntity> ()->SendPdcchMapIdealControlMessage (msg);
 
+   delete msg;
+
    enb->StartTransmission ();
 }
 

--- a/src/devices/lte/model/ue-manager.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/ue-manager.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -38,7 +38,7 @@
 
 UeManager::~UeManager (void)
 {
-  m_ueRecords = 0;
+ delete m_ueRecords;
 }
 
 

--- a/src/devices/lte/model/ue-net-device.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/ue-net-device.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -89,6 +89,7 @@
 {
   NS_LOG_FUNCTION (this);
   m_macEntity = 0;
+  LteNetDevice::DoDispose ();
 }
 
 void

--- a/src/devices/lte/model/ue-phy.cc	Wed Dec 08 12:59:42 2010 +0100
+++ b/src/devices/lte/model/ue-phy.cc	Mon Dec 20 17:12:50 2010 +0100
@@ -155,6 +155,7 @@
   Ptr<UeMacEntity> mac = thisDevice->GetMacEntity ()->GetObject<UeMacEntity> ();
   CqiIdealControlMessage* msg = mac->CreateCqiFeedbacks (sinr);
   SendIdealControlMessage (msg);
+  delete msg;
 }
 
 void