Index: source/ariba/utility/logging/Logging.h
===================================================================
--- source/ariba/utility/logging/Logging.h	(revision 2457)
+++ 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 2457)
+++ 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 2457)
+++ 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;
 }