diff --git a/memory/MemoryMessage.cpp b/memory/MemoryMessage.cpp
index e1db004a1..94fa46917 100644
--- a/memory/MemoryMessage.cpp
+++ b/memory/MemoryMessage.cpp
@@ -62,22 +62,21 @@ void MemoryMessage::clear(CommandMessage* message) {
 		}
 }
 
-ReturnValue_t MemoryMessage::setMemoryCheckCommand(CommandMessage* message,
+void MemoryMessage::setMemoryCheckCommand(CommandMessage* message,
 		uint32_t address, uint32_t length) {
 	message->setCommand(CMD_MEMORY_CHECK);
 	message->setParameter( address );
 	message->setParameter2( length );
-	return HasReturnvaluesIF::RETURN_OK;
 }
 
-ReturnValue_t MemoryMessage::setMemoryCheckReply(CommandMessage* message,
+void MemoryMessage::setMemoryCheckReply(CommandMessage* message,
 		uint16_t crc) {
 	message->setCommand(REPLY_MEMORY_CHECK);
 	message->setParameter( crc );
-	return HasReturnvaluesIF::RETURN_OK;
 }
 
-void MemoryMessage::setCrcReturnValue(CommandMessage* message, ReturnValue_t returnValue){
+void MemoryMessage::setCrcReturnValue(CommandMessage* message,
+        ReturnValue_t returnValue){
 	message->setParameter(returnValue<<16);
 };
 
@@ -93,18 +92,16 @@ Command_t MemoryMessage::getInitialCommand(const CommandMessage* message) {
 	return message->getParameter2();
 }
 
-ReturnValue_t MemoryMessage::setMemoryReplyFailed(CommandMessage* message,
+void MemoryMessage::setMemoryReplyFailed(CommandMessage* message,
 		ReturnValue_t errorCode, Command_t initialCommand) {
 	message->setCommand(REPLY_MEMORY_FAILED);
 	message->setParameter(errorCode);
 	message->setParameter2(initialCommand);
-	return HasReturnvaluesIF::RETURN_OK;
 }
 
-ReturnValue_t MemoryMessage::setMemoryCopyEnd(CommandMessage* message) {
+void MemoryMessage::setMemoryCopyEnd(CommandMessage* message) {
 	message->setCommand(END_OF_MEMORY_COPY);
 	message->setParameter(0);
 	message->setParameter2(0);
-	return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/memory/MemoryMessage.h b/memory/MemoryMessage.h
index 207e539f8..05b9926de 100644
--- a/memory/MemoryMessage.h
+++ b/memory/MemoryMessage.h
@@ -33,13 +33,13 @@ public:
 	        store_address_t storageID);
 	static void setMemoryLoadCommand(CommandMessage* message,
 	        uint32_t address, store_address_t storageID );
-	static ReturnValue_t setMemoryCheckCommand(CommandMessage* message,
+	static void setMemoryCheckCommand(CommandMessage* message,
 	        uint32_t address, uint32_t length);
-	static ReturnValue_t setMemoryCheckReply(CommandMessage* message,
+	static void setMemoryCheckReply(CommandMessage* message,
 	        uint16_t crc);
-	static ReturnValue_t setMemoryReplyFailed(CommandMessage* message,
+	static void setMemoryReplyFailed(CommandMessage* message,
 	        ReturnValue_t errorCode, Command_t initialCommand);
-	static ReturnValue_t setMemoryCopyEnd(CommandMessage* message);
+	static void setMemoryCopyEnd(CommandMessage* message);
 	static void setCrcReturnValue(CommandMessage*, ReturnValue_t returnValue);
 
 	static void clear(CommandMessage* message);
diff --git a/memory/MemoryProxyIF.h b/memory/MemoryProxyIF.h
deleted file mode 100644
index 31045d3f9..000000000
--- a/memory/MemoryProxyIF.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef FRAMEWORK_MEMORY_MEMORYPROXYIF_H_
-#define FRAMEWORK_MEMORY_MEMORYPROXYIF_H_
-
-#include "../memory/AcceptsMemoryMessagesIF.h"
-
-/**
- * This was a nice idea to transparently forward incoming messages to another object.
- * But it doesn't work like that.
- */
-class MemoryProxyIF : public AcceptsMemoryMessagesIF {
-public:
-	virtual MessageQueueId_t getProxyQueue() const = 0;
-	MessageQueueId_t getCommandQueue() const {
-		return getProxyQueue();
-	}
-	virtual ~MemoryProxyIF() {}
-
-};
-
-
-
-#endif /* FRAMEWORK_MEMORY_MEMORYPROXYIF_H_ */