Index: /source/ariba/utility/system/SystemQueue.cpp
===================================================================
--- /source/ariba/utility/system/SystemQueue.cpp	(revision 12460)
+++ /source/ariba/utility/system/SystemQueue.cpp	(revision 12524)
@@ -53,4 +53,13 @@
 }
 
+
+SystemQueue& SystemQueue::instance()
+{
+	static SystemQueue _inst;
+// 	std::cout << "SystemQueue::instance: " << &_inst << std::endl;
+	return _inst;
+}
+
+
 void SystemQueue::scheduleEvent( const SystemEvent& event, uint32_t delay ) {
 #ifndef UNDERLAY_OMNET
@@ -92,9 +101,7 @@
 
 void SystemQueue::run() {
-#ifndef UNDERLAY_OMNET
 	systemQueueRunning = true;
 	directScheduler.run();
 	delayScheduler.run();
-#endif
 }
 
Index: /source/ariba/utility/system/SystemQueue.h
===================================================================
--- /source/ariba/utility/system/SystemQueue.h	(revision 12460)
+++ /source/ariba/utility/system/SystemQueue.h	(revision 12524)
@@ -78,10 +78,6 @@
  */
 
-#ifndef UNDERLAY_OMNET
-class SystemQueue : private boost::noncopyable {
-#else
-class SystemQueue : public cSimpleModule {
-#endif
-	
+class SystemQueue : private boost::noncopyable
+{
 	use_logging_h(SystemQueue);
 	friend class EnterMethod;
@@ -90,17 +86,5 @@
 	 * Get the SystemQueue singleton instance.
 	 */
-	static SystemQueue& instance() {
-		static SystemQueue _inst;
-		return _inst;
-	}
-
-#ifdef UNDERLAY_OMNET
-	/**
-	 * Prevent deletion of this module
-	 * by implementing the virtual method
-	 * and doing nothing in it
-	 */
-	virtual void deleteModule(){}
-#endif
+	static SystemQueue& instance();
 
 	/**
@@ -177,9 +161,4 @@
 	 */
 	~SystemQueue();
-
-#ifdef UNDERLAY_OMNET
-	virtual void handleMessage( cMessage* msg );
-#endif
-