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) {