diff --git a/evaluation/demonstration/client b/evaluation/demonstration/client
index fb6abc464486bf24d3df1f95a91dd4ba5768733c..08ce6278643fc761a40bb77e561dd554975c1675 100755
Binary files a/evaluation/demonstration/client and b/evaluation/demonstration/client differ
diff --git a/evaluation/demonstration/client.c b/evaluation/demonstration/client.c
index d59df01828703c3a63d1711b267ef840a46c6393..94e0d82e12400446b39cfc341018cd5cba2cd308 100644
--- a/evaluation/demonstration/client.c
+++ b/evaluation/demonstration/client.c
@@ -1,5 +1,3 @@
-#define DEBUG
-
 #include <pthread.h>
 #include <assert.h>
 #include <getopt.h>
@@ -354,7 +352,7 @@ int main(const int iArgC, char *papsArgV[])
 			exit(-1);
 		}
 		int iBytesSent=SSL_write(tConfig.pSSL, text->valuestring, strlen(text->valuestring));
-		printf ("[CLIENT DEBUG] Sent %d bytes { %s }\n", iBytesSent, text->valuestring);				
+		printf ("[CLIENT] Sent %d bytes { %s }\n", iBytesSent, text->valuestring);				
 	}
 	cJSON_Delete(json);
 
diff --git a/evaluation/demonstration/middlebox b/evaluation/demonstration/middlebox
index da3f03d053ddcfa4d6b6f8219d5a0c1a6fa24092..af7916355aa645d6d4e6e4ee67e433e237518426 100755
Binary files a/evaluation/demonstration/middlebox and b/evaluation/demonstration/middlebox differ
diff --git a/evaluation/demonstration/middlebox.c b/evaluation/demonstration/middlebox.c
index 110cd5af572385a671c6d53be74026f331f6a920..c49bf33f16feb394c57bdf85e02e144fae6cb2ed 100644
--- a/evaluation/demonstration/middlebox.c
+++ b/evaluation/demonstration/middlebox.c
@@ -1,5 +1,3 @@
-#define DEBUG
-
 #include "common.h"
 #include <time.h>
 #include <stdbool.h>
@@ -474,7 +472,7 @@ int main(int argc, char **argv)
 
     if (argc < 4)
     {
-		printf ("Usage: mcmbox port proxy-address midlebox-id [command handler...]\n");
+		printf ("Usage: middlebox port proxy-address midlebox-id [command handler...]\n");
 		exit(0);
     }
 	port = atoi(argv[1]);
diff --git a/evaluation/demonstration/server b/evaluation/demonstration/server
index 071b9badd400f948a0cca73582d7397efcc7a082..32fd7f747ed48a14e44939ac1671e803d94c00d0 100755
Binary files a/evaluation/demonstration/server and b/evaluation/demonstration/server differ