Index: /source/ariba/utility/transport/StreamTransport/StreamTransport.cpp
===================================================================
--- /source/ariba/utility/transport/StreamTransport/StreamTransport.cpp	(revision 12773)
+++ /source/ariba/utility/transport/StreamTransport/StreamTransport.cpp	(revision 12774)
@@ -366,6 +366,5 @@
         parent(parent),
         out_queues(8), //TODO How much priorities shall we have?
-        sending(false),
-        MAGIC_NUMBER(424242)
+        sending(false)
 {
         header.length = 0;
@@ -595,31 +594,22 @@
     bool restart_sending = false;
     
-	// FIXME Mario DEBUGGING  --  copy !!
-	reboost::shared_buffer_t buff = packet.linearize();
-	reboost::message_t msg;
-	msg.push_back(buff);
-	assert ( msg.MAGIC_NUMBER == 421337 );
-	// [ DEBUGGING ]
+	// debugging --> copy message (instead of zero copy)
+// 	reboost::shared_buffer_t buff = packet.linearize();
+// 	reboost::message_t msg;
+// 	msg.push_back(buff);
+// 	assert ( msg.MAGIC_NUMBER == 421337 );
+	// [ debugging ]
 	
 	
     // enqueue packet  [locked]
     {
-        boost::mutex::scoped_lock lock(out_queues_lock);
-		
-		int debuggingA = out_queues[priority].size();
-// 		assert ( debuggingA < 1000 ); // XXX
+        unique_lock lock(out_queues_lock);
 		
 		assert ( this->valid );
-        
-        assert( priority < out_queues.size() );  // NOTE: actual assert, not in context with the extended debugging..
-//         out_queues[priority].push(packet);  // FIXME Mario
-		out_queues[priority].push(msg);		   // FIXME Mario
-		
-		// XXX
-		int debuggingB = out_queues[priority].size();
-		int magic = out_queues[priority].back().MAGIC_NUMBER;
-		assert ( debuggingB == debuggingA + 1 );
-		assert ( magic == 421337 );
-        
+        assert( priority < out_queues.size() );
+
+		// * enqueue *
+		out_queues[priority].push(packet);
+		        
         if ( ! sending )
         {
@@ -643,9 +633,8 @@
     bool found = false;
 
-	// XXX Mario: Debugging
+	// I'm not sure if this can actually happen.. But let's be on the save side, here.
 	if ( ! this->valid )
 	{
 		this->sending = false;
-		cout << "/// StreamConnection::send_next_package() on INVALID STREAM" << endl;
 		return;
 	}
@@ -653,17 +642,9 @@
     // find packet with highest priority  [locked]
     {
-        boost::mutex::scoped_lock lock(out_queues_lock);
+        unique_lock lock(out_queues_lock);
 		
-		assert ( this->valid ); // XXX TODO ggf. in if (valid) Àndern...
-		assert ( this->sending );
-		assert ( this->MAGIC_NUMBER == 424242 );
-		assert ( this->out_queues.size() == 8 );
-        
         for ( vector<OutQueue>::iterator it = out_queues.begin();
                 it != out_queues.end(); it++ )
         {
-			int debugging = it->size();  // XXX debugging
-// 			assert ( debugging < 1000 );
-			
             if ( !it->empty() )
             {
Index: /source/ariba/utility/transport/StreamTransport/StreamTransport.hpp
===================================================================
--- /source/ariba/utility/transport/StreamTransport/StreamTransport.hpp	(revision 12773)
+++ /source/ariba/utility/transport/StreamTransport/StreamTransport.hpp	(revision 12774)
@@ -66,7 +66,4 @@
         virtual ~StreamConnection()
 		{
-			// XXX MARIO Debugging
-			std::cout << "/// ~StreamConnection(): " << this << ", SENDING: " << this->sending << ", VALID: " << this->valid << std::endl;
-			
 			assert ( this->valid == false );
 		}
@@ -133,7 +130,4 @@
         shared_buffer_t buffy;
         
-		
-		// XXX Mario: Debugging
-		const int MAGIC_NUMBER;
     private:
         std::vector<ariba::utility::LinkID*> communication_links;
Index: /source/ariba/utility/transport/messages/message.hpp
===================================================================
--- /source/ariba/utility/transport/messages/message.hpp	(revision 12773)
+++ /source/ariba/utility/transport/messages/message.hpp	(revision 12774)
@@ -69,7 +69,5 @@
 	/// Create a new message
 	inline message_t() :
-		imsg(),
-		MAGIC_IDENTIFIER("!!message_t-MAGIC_IDENTIFIER!!"), // XXX Mario: Debugging
-		MAGIC_NUMBER(421337) // XXX Mario: Debugging
+		imsg()
 	{
 	}
@@ -77,11 +75,7 @@
 	/// Copy message
 	inline message_t(const message_t& msg) :
-		imsg(msg.imsg),
-		MAGIC_IDENTIFIER(msg.MAGIC_IDENTIFIER),  // XXX
-		MAGIC_NUMBER(msg.MAGIC_NUMBER) // XXX
+		imsg(msg.imsg)
 
 	{
-		assert ( msg.MAGIC_NUMBER == 421337 ); // XXX
-		
 	    if ( imsg )
 	        imsg->owner = NULL;
@@ -96,6 +90,4 @@
 	inline message_t& operator=(const message_t& msg)
 	{
-		assert ( msg.MAGIC_NUMBER == 421337 ); // XXX
-		
 		if ( msg.imsg )
 		{
@@ -105,5 +97,4 @@
 		else
 		{
-			// TODO: is this a valid state? (since it can definitely been reached...)
 			imsg.reset();
 		}
@@ -274,20 +265,13 @@
 		mlength_t index, length;
 		
-		// XXX Mario: Debugging
-		const std::string MAGIC_IDENTIFIER;
-		const int MAGIC_NUMBER;
 	public:
 		inline imsg_t() :
 			owner(NULL),
 			index(0),
-			length(0),
-			MAGIC_IDENTIFIER("!!imsg_t-MAGIC_IDENTIFIER!!"), // XXX Mario: Debugging
-			MAGIC_NUMBER(133742)
+			length(0)
 		{
 		}
 		inline imsg_t(const imsg_t& imsg) :
-			index(imsg.index), length(imsg.length),
-			MAGIC_IDENTIFIER(imsg.MAGIC_IDENTIFIER),  // XXX
-			MAGIC_NUMBER(imsg.MAGIC_NUMBER) // XXX
+			index(imsg.index), length(imsg.length)
 		{
 			for (mlength_t i = 0; i < length; i++)
@@ -359,5 +343,6 @@
 			length--;
 		}
-	};
+	}; // [ class imsg_t ] -- inner class
+	
 	/// own a new message
 	inline imsg_t& own() {
@@ -368,11 +353,6 @@
 		return *imsg;
 	}
-	boost::shared_ptr<imsg_t> imsg;
-	
-	// XXX Mario: Debugging
-public:
-	const std::string MAGIC_IDENTIFIER;
-	const int MAGIC_NUMBER;
-};
+	boost::shared_ptr<imsg_t> imsg;	
+}; // [ class message_t ] -- outer class
 
 inline message_t operator+(const message_t& lhs, const message_t& rhs) {