Index: source/ariba/overlay/messages/DHTMessage.cpp
===================================================================
--- source/ariba/overlay/messages/DHTMessage.cpp	(revision 10573)
+++ 	(revision )
@@ -1,44 +1,0 @@
-#include "DHTMessage.h"
-
-#include<boost/foreach.hpp>
-
-namespace ariba {
-namespace overlay {
-
-vsznDefault(DHTMessage);
-
-DHTMessage::DHTMessage() :
-	ttl( 0 ),
-	replace( false )
-{}
-
-DHTMessage::DHTMessage( const Data& key ) :
-	ttl( 0 ),
-	replace( false ),
-	key( key.clone() )
-{}
-
-DHTMessage::DHTMessage( const Data& key, const Data& value ) :
-	ttl( 0 ),
-	replace( false ),
-	key( key.clone() ),
-	values(1, value.clone())
-{}
-
-DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) :
-	ttl( 0 ),
-	replace( false ),
-	key( key.clone() )
-{
-	// preallocate enough room so we don't need to copy a lot
-	this->values.reserve(values.size());
-	BOOST_FOREACH(const Data value, values )
-		this->values.push_back( value.clone() );
-}
-
-DHTMessage::~DHTMessage() {
-	this->key.release();
-	BOOST_FOREACH( Data& value, values ) value.release();
-}
-
-}}
Index: source/ariba/overlay/messages/DHTMessage.h
===================================================================
--- source/ariba/overlay/messages/DHTMessage.h	(revision 10573)
+++ 	(revision )
@@ -1,98 +1,0 @@
-#ifndef DHTMESSAGE_H_
-#define DHTMESSAGE_H_
-
-#include "ariba/utility/messages.h"
-#include "ariba/utility/serialization.h"
-
-namespace ariba {
-namespace overlay {
-
-using ariba::utility::Message;
-using_serialization;
-
-class DHTMessage : public Message { VSERIALIZEABLE
-public:
-	DHTMessage();
-	DHTMessage( const Data& key );
-	DHTMessage( const Data& key, const Data& value );
-	DHTMessage( const Data& key, const vector<Data>& values );
-	virtual ~DHTMessage();
-
-	NodeID getHashedKey() const {
-		return NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-	}
-
-	const Data& getKey() const {
-		return key;
-	}
-
-	/// returns the first element of the key vector
-	const Data& getValue() const {
-		return values.at(0);
-	}
-
-	bool hasValues() const {
-		return values.size() != 0;
-	}
-
-	uint16_t getTTL() const {
-		return ttl;
-	}
-
-	void setTTL( uint16_t ttl ) {
-		this->ttl = ttl;
-	}
-
-	void setReplace( bool replace ) {
-		this->replace = replace;
-	}
-
-	bool doReplace() const {
-		return replace;
-	}
-
-	/// return alles values for the key
-	const vector<Data>& getValues() const {
-		return values;
-	}
-
-private:
-	uint16_t ttl;
-	bool replace;
-	Data key;
-	vector<Data> values;
-};
-
-}} // namespace ariba::overlay
-
-sznBeginDefault( ariba::overlay::DHTMessage, X ) {
-
-	// serialize flags
-	X && replace && cI(0,7);
-
-	// serialize tll
-	X && ttl;
-
-	// key serialization
-	uint16_t key_length = key.isUnspecified() ? 0 : key.getLength();
-	X && key_length;
-	if (X.isDeserializer()) key.setLength( key_length );
-	X && this->key;
-
-	// store number of values
-	uint16_t num_values = values.size();
-	X && num_values;
-
-	// value serialization
-	for (size_t i=0; i<num_values; i++) {
-		Data value;
-		if (X.isSerializer()) value = values[i];
-		uint16_t value_length = value.isUnspecified() ? 0 : value.getLength();
-		X && value_length;
-		if (X.isDeserializer()) value.setLength( value_length );
-		X && value;
-		if (X.isDeserializer()) values.push_back(value);
-	}
-} sznEnd();
-
-#endif /* DHTMESSAGE_H_ */
Index: source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- source/ariba/overlay/messages/OverlayMsg.h	(revision 10573)
+++ source/ariba/overlay/messages/OverlayMsg.h	(revision 10653)
@@ -89,5 +89,6 @@
 		typeLinkAlive   = 0x35, ///< keep-alive message
 
-		// DHT routed messages
+		/// DHT routed messages
+		/// @deprecated because the DHT has been moved into a separate service
 		maskDHT			= 0x40, ///< bit mask for dht messages
 		typeDHTPut      = 0x41, ///< DHT put operation
@@ -96,4 +97,5 @@
 
 		/// DHT response messages
+		/// @deprecated because the DHT has been moved into a separate service
 		maskDHTResponse = 0x50, ///< bit mask for dht responses
 		typeDHTData     = 0x51, ///< DHT get data
@@ -197,8 +199,4 @@
 	}
 
-	bool isDHTMessage() const {
-		return hasTypeMask(maskDHT);
-	}
-
 	/// number of hops and time to live ----------------------------------------