diff --git a/src/sync-logic.h b/src/sync-logic.h
index 5efb81e..4e9e69b 100644
--- a/src/sync-logic.h
+++ b/src/sync-logic.h
@@ -48,11 +48,6 @@
 #endif
 #endif
 
-#ifdef NS3_MODULE
-#include <ns3/application.h>
-#include <ns3/random-variable.h>
-#endif
-
 namespace Sync {
 
 struct MissingDataInfo {
@@ -68,9 +63,6 @@
  */
 
 class SyncLogic
-#ifdef NS3_MODULE
-  : public ns3::Application
-#endif
 {
 public:
   //typedef boost::function< void ( const std::string &/*prefix*/, const SeqNo &/*newSeq*/, const SeqNo &/*oldSeq*/ ) > LogicUpdateCallback;
@@ -130,12 +122,6 @@
   ndn::Scheduler &
   getScheduler () { return m_scheduler; }
 #endif
-
-#ifdef NS3_MODULE
-public:
-  virtual void StartApplication ();
-  virtual void StopApplication ();
-#endif
   
   void stop();
 
@@ -229,24 +215,13 @@
 
   ndn::Scheduler m_scheduler;
 
-#ifndef NS3_MODULE
   boost::mt19937 m_randomGenerator;
   boost::variate_generator<boost::mt19937&, boost::uniform_int<> > m_rangeUniformRandom;
   boost::variate_generator<boost::mt19937&, boost::uniform_int<> > m_reexpressionJitter;
-#else
-  ns3::UniformVariable m_rangeUniformRandom;
-  ns3::UniformVariable m_reexpressionJitter;
-#endif
 
   static const int m_unknownDigestStoreTime = 10; // seconds
-#ifdef NS3_MODULE
-  static const int m_syncResponseFreshness = 100; // milliseconds
-  static const int m_syncInterestReexpress = 10; // seconds
-  // don't forget to adjust value in SyncCcnxWrapper
-#else
-  static const int m_syncResponseFreshness = 4;
+  static const int m_syncResponseFreshness = 100;
   static const int m_syncInterestReexpress = 4;
-#endif
 
   static const int m_defaultRecoveryRetransmitInterval = 200; // milliseconds
   uint32_t m_recoveryRetransmissionInterval; // milliseconds
@@ -254,6 +229,9 @@
   ndn::EventId m_delayedInterestProcessingId;
   ndn::EventId m_reexpressingInterestId;
   ndn::EventId m_reexpressingRecoveryInterestId;
+  
+  std::string m_instanceId;
+  static int m_instanceCounter;
 };