--- a/src/lte/model/lte-enb-rrc.cc	Mon Aug 12 19:48:33 2013 +0300
+++ b/src/lte/model/lte-enb-rrc.cc	Mon Aug 12 20:12:57 2013 +0300
@@ -20,30 +20,27 @@
  *         Manuel Requena <manuel.requena@cttc.es>
  */
 
-#include "ns3/fatal-error.h"
-#include "ns3/log.h"
-#include "ns3/abort.h"
-#include "ns3/pointer.h"
-#include "ns3/object-map.h"
-#include "ns3/object-factory.h"
-#include "ns3/simulator.h"
-
 #include "lte-enb-rrc.h"
 
-#include "lte-enb-net-device.h"
-#include "lte-radio-bearer-info.h"
-#include "eps-bearer-tag.h"
-#include "ff-mac-csched-sap.h"
-#include "epc-enb-s1-sap.h"
+#include <ns3/fatal-error.h>
+#include <ns3/log.h>
+#include <ns3/abort.h>
+
+#include <ns3/pointer.h>
+#include <ns3/object-map.h>
+#include <ns3/object-factory.h>
+#include <ns3/simulator.h>
 
-#include "lte-rlc.h"
-#include "lte-rlc-tm.h"
-#include "lte-rlc-um.h"
-#include "lte-rlc-am.h"
-#include "lte-pdcp.h"
-#include "lte-pdcp-sap.h"
+#include <ns3/lte-radio-bearer-info.h>
+#include <ns3/eps-bearer-tag.h>
+#include <ns3/packet.h>
 
-#include <ns3/simulator.h>
+#include <ns3/lte-rlc.h>
+#include <ns3/lte-rlc-tm.h>
+#include <ns3/lte-rlc-um.h>
+#include <ns3/lte-rlc-am.h>
+#include <ns3/lte-pdcp.h>
+#include <ns3/lte-pdcp-sap.h>
 
 
 
@@ -260,11 +257,6 @@
       break;      
     }  
 
-  m_servingCellMeasures = CreateObject<UeMeasure> ();
-  m_servingCellMeasures->m_cellId = m_rrc->m_cellId;
-  m_servingCellMeasures->m_rsrp = 0;
-  m_servingCellMeasures->m_rsrq = 0;
-
 }
 
 
@@ -284,7 +276,6 @@
       m_rrc->m_x2uTeidInfoMap.erase (it->second->m_gtpTeid);
     }
 
-  m_servingCellMeasures = 0;
 }
 
 TypeId UeManager::GetTypeId (void)
@@ -313,7 +304,7 @@
     .AddTraceSource ("StateTransition",
                      "fired upon every UE state transition seen by the UeManager at the eNB RRC",
                      MakeTraceSourceAccessor (&UeManager::m_stateTransitionTrace))
-    ;
+  ;
   return tid;
 }
 

--- a/src/lte/model/lte-enb-rrc.h	Mon Aug 12 19:48:33 2013 +0300
+++ b/src/lte/model/lte-enb-rrc.h	Mon Aug 12 20:12:57 2013 +0300
@@ -25,10 +25,13 @@
 
 #include <ns3/nstime.h>
 #include <ns3/object.h>
-#include <ns3/packet.h>
+#include <ns3/traced-callback.h>
+#include <ns3/event-id.h>
+
 #include <ns3/lte-enb-cmac-sap.h>
 #include <ns3/lte-mac-sap.h>
 #include <ns3/ff-mac-sched-sap.h>
+#include <ns3/ff-mac-csched-sap.h>
 #include <ns3/lte-pdcp-sap.h>
 #include <ns3/epc-x2-sap.h>
 #include <ns3/epc-enb-s1-sap.h>
@@ -36,8 +39,6 @@
 #include <ns3/lte-enb-cphy-sap.h>
 #include <ns3/lte-rrc-sap.h>
 #include <ns3/lte-anr-sap.h>
-#include <ns3/traced-callback.h>
-#include <ns3/event-id.h>
 
 #include <map>
 #include <set>
@@ -47,24 +48,9 @@
 class LteRadioBearerInfo;
 class LteSignalingRadioBearerInfo;
 class LteDataRadioBearerInfo;
-class EpcEnbS1SapUser;
-class EpcEnbS1SapProvider;
-class LteUeRrc;
 class LteEnbRrc;
-
-
+class Packet;
 
-/**
- * Measurements reported by a UE for a cellId
- * The values are quantized according 3GPP TS XXXXX
- */
-class UeMeasure : public Object
-{
-public:
-  uint16_t  m_cellId;
-  uint8_t   m_rsrp;
-  uint8_t   m_rsrq;
-};
 
 
 /**
@@ -419,20 +405,10 @@
   EventId m_handoverJoiningTimeout;
   EventId m_handoverLeavingTimeout;
 
-  Ptr<UeMeasure> m_servingCellMeasures;
-  //       cellid
-  std::map<uint16_t, Ptr<UeMeasure> > m_neighbourCellMeasures;
-
 };
 
 
 
-class LteHandoverManagementSapProvider;
-class LteHandoverManagementSapUser;
-class LteAnrSapProvider;
-class LteAnrSapUser;
-
-
 /**
  * \ingroup lte
  * 
@@ -629,7 +605,7 @@
                       uint16_t ulEarfcn, 
                       uint16_t dlEarfcn,
                       uint16_t cellId);
-  
+
   /** 
    * set the cell id of this eNB
    *