Index: source/ariba/AribaModule.cpp
===================================================================
--- source/ariba/AribaModule.cpp	(revision 2461)
+++ source/ariba/AribaModule.cpp	(revision 2467)
@@ -132,5 +132,5 @@
 	}
 
-	std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
+	//std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
 }
 
Index: source/ariba/Makefile.am
===================================================================
--- source/ariba/Makefile.am	(revision 2461)
+++ source/ariba/Makefile.am	(revision 2467)
@@ -35,4 +35,8 @@
 if OMNET
 AM_CPPFLAGS    += -fPIC -DUNDERLAY_OMNET
+endif
+
+if LOGCOLORS
+AM_CPPFLAGS    += -DLOGCOLORS
 endif
 
Index: source/ariba/communication/modules/transport/protlib/logfile.cpp
===================================================================
--- source/ariba/communication/modules/transport/protlib/logfile.cpp	(revision 2461)
+++ source/ariba/communication/modules/transport/protlib/logfile.cpp	(revision 2467)
@@ -119,8 +119,8 @@
   if (logstream && !quiet)
   {
-    (*logstream) << color[blue] << timenow() << '[' << getpid() << "] Redirecting Log output to \"" << filename << '\"' << endl;
-    (*logstream) << color[blue] << timenow() 
-		 << '[' << getpid() << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<" 
-		 << color[off] << endl;
+//     (*logstream) << color[blue] << timenow() << '[' << getpid() << "] Redirecting Log output to \"" << filename << '\"' << endl;
+//     (*logstream) << color[blue] << timenow() 
+// 		 << '[' << getpid() << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<" 
+// 		 << color[off] << endl;
   }
 
@@ -144,7 +144,7 @@
   else
   {
-    (*logstream) << color[blue] << timenow() 
-		 << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>" 
-		 << color[off] << endl;
+//     (*logstream) << color[blue] << timenow() 
+// 		 << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>" 
+// 		 << color[off] << endl;
   }
   return true;
Index: source/ariba/communication/modules/transport/protlib/logfile.h
===================================================================
--- source/ariba/communication/modules/transport/protlib/logfile.h	(revision 2461)
+++ source/ariba/communication/modules/transport/protlib/logfile.h	(revision 2467)
@@ -31,5 +31,5 @@
 
 
-//#define _NO_LOGGING
+#define _NO_LOGGING
 
 #include <fstream> // file stream
@@ -243,7 +243,7 @@
     if (!quiet_start && logstream)
     {
-      (*logstream) << color[blue] << timenow()
-		   << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>"
-		   << color[off] << endl;
+//       (*logstream) << color[blue] << timenow()
+// 		   << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>"
+// 		   << color[off] << endl;
     }
     pthread_mutex_unlock(&logmutex);
@@ -260,7 +260,7 @@
 
     if ( ! quiet_start )
-	(*logstream) << color[blue] << timenow() << '[' << getpid()
-	<< "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<"
-	<< color[off] << endl;
+// 	(*logstream) << color[blue] << timenow() << '[' << getpid()
+// 	<< "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<"
+// 	<< color[off] << endl;
     pthread_mutex_unlock(&logmutex);
 
Index: source/ariba/communication/modules/transport/tcp/TCPTransport.cpp
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 2461)
+++ source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 2467)
@@ -314,7 +314,7 @@
 
 		// send message
-		cout << "Sending message ..." << endl;
+		//cout << "Sending message ..." << endl;
 		sendMessage( new TextMessage( "Hello World!" ) );
-		cout << "Message sent ..." << endl;
+		//cout << "Message sent ..." << endl;
 
 	}
Index: source/ariba/communication/modules/transport/tcp/TCPTransport.h
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransport.h	(revision 2461)
+++ source/ariba/communication/modules/transport/tcp/TCPTransport.h	(revision 2467)
@@ -41,5 +41,5 @@
 
 // kill protlib logging
-//#define _NO_LOGGING
+#define _NO_LOGGING
 
 #include "ariba/utility/logging/Logging.h"
Index: source/ariba/utility/logging/Logging.h
===================================================================
--- source/ariba/utility/logging/Logging.h	(revision 2461)
+++ source/ariba/utility/logging/Logging.h	(revision 2467)
@@ -45,9 +45,21 @@
 #include <log4cxx/basicconfigurator.h>
 
-#define colorDefault { std::cout << "\033[0m";  } /*reset*/
-#define colorDebug   { std::cout << "\033[31m"; } /*gray*/
-#define colorInfo    { std::cout << "\033[32m"; } /*green*/
-#define colorWarn    { std::cout << "\033[34m"; } /*blue*/
-#define colorError   { std::cout << "\033[31m"; } /*red*/
+#ifdef LOGCOLORS
+
+  #define colorDefault { std::cout << "\033[0m";  } /*reset*/
+  #define colorDebug   { std::cout << "\033[33m"; } /*cyan*/
+  #define colorInfo    { std::cout << "\033[32m"; } /*green*/
+  #define colorWarn    { std::cout << "\033[34m"; } /*blue*/
+  #define colorError   { std::cout << "\033[31m"; } /*red*/
+
+#else
+
+  #define colorDefault { }
+  #define colorDebug   { }
+  #define colorInfo    { }
+  #define colorWarn    { }
+  #define colorError   { }
+
+#endif // ENABLE_LOGCOLORS
 
 #define use_logging_h(x) \
@@ -57,10 +69,10 @@
 	log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);              }
-#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;}
-#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;}
-#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;}
-#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;}
-#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); exit(-1);    }
+#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
 
 #endif //LOGGING_H__
Index: source/ariba/utility/messages/MessageReceiver.cpp
===================================================================
--- source/ariba/utility/messages/MessageReceiver.cpp	(revision 2461)
+++ source/ariba/utility/messages/MessageReceiver.cpp	(revision 2467)
@@ -50,5 +50,5 @@
 
 bool MessageReceiver::receiveMessage( const Message* message, const LinkID& link, const NodeID& node ) {
-	std::cout << "UNIMPLEMENTED MessageReceiver got Message:" << (Message*)message << std::endl;
+	//std::cout << "UNIMPLEMENTED MessageReceiver got Message:" << (Message*)message << std::endl;
 	return false;
 }
Index: source/ariba/utility/system/Timer.cpp
===================================================================
--- source/ariba/utility/system/Timer.cpp	(revision 2461)
+++ source/ariba/utility/system/Timer.cpp	(revision 2467)
@@ -89,5 +89,5 @@
 
 void Timer::eventFunction() {
-	std::cout << "Timer(" << millis << ")" << std::endl;
+	//std::cout << "unimplemented eventFunction Timer(" << millis << ")" << std::endl;
 }