Index: common/Message.cpp
===================================================================
--- common/Message.cpp	(revision 5a64bea142d5f3694a0dd6c567c632ee4b97c3ee)
+++ common/Message.cpp	(revision 9b5d30bd77df410865678bf12cc80310383b1346)
@@ -15,4 +15,5 @@
 using namespace std;
 
+/*
 int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
 {
@@ -33,2 +34,3 @@
    return ret;
 }
+*/
Index: common/Message.h
===================================================================
--- common/Message.h	(revision 5a64bea142d5f3694a0dd6c567c632ee4b97c3ee)
+++ common/Message.h	(revision 9b5d30bd77df410865678bf12cc80310383b1346)
@@ -26,7 +26,7 @@
 } NETWORK_MSG;
 
-int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
+//int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
 
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
+//int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
 
 #endif
Index: common/MessageProcessor.cpp
===================================================================
--- common/MessageProcessor.cpp	(revision 5a64bea142d5f3694a0dd6c567c632ee4b97c3ee)
+++ common/MessageProcessor.cpp	(revision 9b5d30bd77df410865678bf12cc80310383b1346)
@@ -11,7 +11,7 @@
 
 int MessageProcessor::sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest) {
+   msg->id = ++lastUsedId;
    MessageContainer message(*msg, *dest);
-   message.id = ++lastUsedId;
-   sentMessages[message.id] = message;
+   sentMessages[msg->id] = message;
 
    int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
Index: common/MessageProcessor.h
===================================================================
--- common/MessageProcessor.h	(revision 5a64bea142d5f3694a0dd6c567c632ee4b97c3ee)
+++ common/MessageProcessor.h	(revision 9b5d30bd77df410865678bf12cc80310383b1346)
@@ -59,8 +59,6 @@
 
       MessageContainer(const MessageContainer& mc) {
-         this->id = mc.id;
+         this->msg = mc.msg;
          this->clientAddr = mc.clientAddr;
-         this->msg = mc.msg;
-         this->ackReceived = mc.ackReceived;
       }
 
@@ -73,8 +71,6 @@
       }
 
-      int id;
+      NETWORK_MSG msg;
       struct sockaddr_in clientAddr;
-      NETWORK_MSG msg;
-      bool ackReceived;
    };