--- a/src/core/model/calendar-scheduler.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/calendar-scheduler.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -35,7 +35,6 @@
 TypeId
 CalendarScheduler::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::CalendarScheduler")
     .SetParent<Scheduler> ()
     .AddConstructor<CalendarScheduler> ()

--- a/src/core/model/heap-scheduler.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/heap-scheduler.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -34,7 +34,6 @@
 TypeId
 HeapScheduler::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::HeapScheduler")
     .SetParent<Scheduler> ()
     .AddConstructor<HeapScheduler> ()

--- a/src/core/model/list-scheduler.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/list-scheduler.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -35,7 +35,6 @@
 TypeId
 ListScheduler::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ListScheduler")
     .SetParent<Scheduler> ()
     .AddConstructor<ListScheduler> ()

--- a/src/core/model/map-scheduler.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/map-scheduler.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -34,7 +34,6 @@
 TypeId
 MapScheduler::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::MapScheduler")
     .SetParent<Scheduler> ()
     .AddConstructor<MapScheduler> ()

--- a/src/core/model/object.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/object.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -82,7 +82,6 @@
 TypeId
 Object::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::Object")
     .SetParent<ObjectBase> ()
   ;

--- a/src/core/model/random-variable-stream.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/random-variable-stream.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -45,7 +45,6 @@
 TypeId 
 RandomVariableStream::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::RandomVariableStream")
     .SetParent<Object> ()
     .AddAttribute("Stream",
@@ -136,7 +135,6 @@
 TypeId 
 UniformRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::UniformRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<UniformRandomVariable> ()
@@ -207,7 +205,6 @@
 TypeId 
 ConstantRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ConstantRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ConstantRandomVariable> ()
@@ -262,7 +259,6 @@
 TypeId 
 SequentialRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::SequentialRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<SequentialRandomVariable> ()
@@ -362,7 +358,6 @@
 TypeId 
 ExponentialRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ExponentialRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ExponentialRandomVariable> ()
@@ -444,7 +439,6 @@
 TypeId 
 ParetoRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ParetoRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ParetoRandomVariable> ()
@@ -540,7 +534,6 @@
 TypeId 
 WeibullRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::WeibullRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<WeibullRandomVariable> ()
@@ -636,7 +629,6 @@
 TypeId 
 NormalRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::NormalRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<NormalRandomVariable> ()
@@ -754,7 +746,6 @@
 TypeId 
 LogNormalRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::LogNormalRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<LogNormalRandomVariable> ()
@@ -874,7 +865,6 @@
 TypeId 
 GammaRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::GammaRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<GammaRandomVariable> ()
@@ -1050,7 +1040,6 @@
 TypeId 
 ErlangRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ErlangRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ErlangRandomVariable> ()
@@ -1162,7 +1151,6 @@
 TypeId 
 TriangularRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::TriangularRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<TriangularRandomVariable> ()
@@ -1259,7 +1247,6 @@
 TypeId 
 ZipfRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ZipfRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ZipfRandomVariable> ()
@@ -1350,7 +1337,6 @@
 TypeId 
 ZetaRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::ZetaRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<ZetaRandomVariable> ()
@@ -1434,7 +1420,6 @@
 TypeId 
 DeterministicRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::DeterministicRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<DeterministicRandomVariable> ()
@@ -1527,7 +1512,6 @@
 TypeId 
 EmpiricalRandomVariable::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::EmpiricalRandomVariable")
     .SetParent<RandomVariableStream>()
     .AddConstructor<EmpiricalRandomVariable> ()

--- a/src/core/model/scheduler.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/scheduler.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -36,7 +36,6 @@
 TypeId
 Scheduler::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::Scheduler")
     .SetParent<Object> ()
   ;

--- a/src/core/model/simulator-impl.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/simulator-impl.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -8,7 +8,6 @@
 TypeId 
 SimulatorImpl::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::SimulatorImpl")
     .SetParent<Object> ()
   ;

--- a/src/core/model/synchronizer.cc	Tue Nov 13 14:24:27 2012 +0100
+++ b/src/core/model/synchronizer.cc	Tue Nov 13 15:02:39 2012 +0100
@@ -28,7 +28,6 @@
 TypeId 
 Synchronizer::GetTypeId (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::Synchronizer")
     .SetParent<Object> ()
   ;