Index: /source/ariba/utility/messages/Message.h
===================================================================
--- /source/ariba/utility/messages/Message.h	(revision 3709)
+++ /source/ariba/utility/messages/Message.h	(revision 3710)
@@ -46,8 +46,4 @@
 #include<boost/shared_array.hpp>
 
-
-// local includes
-#include "MessageControlInfo.h"
-
 // forward declaration
 #include "_namespace.h"
@@ -96,5 +92,4 @@
 	const Address* srcAddr;
 	const Address* destAddr;
-	const MessageControlInfo* ctrlInfo;
 
 public:
@@ -103,5 +98,5 @@
 	 */
 	inline Message() :
-		root(), releasePayload(true), payload(), srcAddr(NULL),destAddr(NULL),ctrlInfo(NULL) {
+		root(), releasePayload(true), payload(), srcAddr(NULL),destAddr(NULL) {
 	}
 
@@ -111,5 +106,5 @@
 	 */
 	inline Message( const Data& data ) :
-		srcAddr(NULL),destAddr(NULL),ctrlInfo(NULL), releasePayload(true) {
+		srcAddr(NULL),destAddr(NULL), releasePayload(true) {
 		this->payload = data.clone();
 //		this->root = shared_array<uint8_t>((uint8_t*)data.getBuffer());
@@ -173,22 +168,4 @@
 	inline const Address* getSourceAddress() const {
 		return srcAddr;
-	}
-
-	/**
-	 * Set optional control information
-	 *
-	 * @parm ctrlInfo The optional control information
-	 */
-	inline void setControlInfo(const MessageControlInfo* ctrlInfo) {
-		this->ctrlInfo = ctrlInfo;
-	}
-
-	/**
-	 * Returns the optional control information or NULL
-	 *
-	 * @return The optional control information or NULL
-	 */
-	inline const MessageControlInfo* getControlInfo() const {
-		return ctrlInfo;
 	}
 
Index: urce/ariba/utility/messages/MessageControlInfo.cpp
===================================================================
--- /source/ariba/utility/messages/MessageControlInfo.cpp	(revision 3709)
+++ 	(revision )
@@ -1,58 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ARIBA PROJECT OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#include "MessageControlInfo.h"
-
-NAMESPACE_BEGIN
-
-MessageControlInfo::MessageControlInfo() {
-}
-
-MessageControlInfo::~MessageControlInfo() {
-}
-
-/**
- * Returns true, if this object needs to be deleted
- *
- * @return True, if this object needs to be deleted
- */
-bool MessageControlInfo::needsDeletion() {
-	return true;
-}
-
-NAMESPACE_END
Index: urce/ariba/utility/messages/MessageControlInfo.h
===================================================================
--- /source/ariba/utility/messages/MessageControlInfo.h	(revision 3709)
+++ 	(revision )
@@ -1,62 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ARIBA PROJECT OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#ifndef MESSAGECONTROLINFO_H_
-#define MESSAGECONTROLINFO_H_
-
-#include "_namespace.h"
-
-NAMESPACE_BEGIN
-
-class MessageControlInfo {
-public:
-	MessageControlInfo();
-
-	virtual ~MessageControlInfo();
-
-	/**
-	 * Returns true, if this object needs to be deleted
-	 *
-	 * @return True, if this object needs to be deleted
-	 */
-	virtual bool needsDeletion();
-};
-
-NAMESPACE_END
-
-#endif /* MESSAGECONTROLINFO_H_ */