diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 7369a5d61664835324764282971d1f85acedc48f..6c5b3a123f85088fdaf06340aa55afd17f60bfca 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,2 +1,2 @@
-Message from 1122492445..., +CrSKtshK1HhaYaw+S8ePLYeVru/E+z/bwVOpfn3noY= Received: Hello, 18, with E2E Encryption
+Received: Hello, 18, with E2E Encryption
 Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index 364c8e147346f8bd6719e02d274211cf96195128..b7b5025fa9044d512b291a9ff86fe107aa318b7a 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,2 +1,3 @@
 Message from 7, Rick Received: Hello, 4
+Received: Hello, 4
 Sending Message to 5, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 1384be5a4ce630dc90dff84dfb783290f9091de7..78d8019c8011f532a932684c754c2da272c80780 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,2 +1,3 @@
 Message from 4, Jim Received: Hello, 5
+Received: Hello, 5
 Sending Message to 6, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 37a4dcdaf58be9e54e1e783937edae2521d579ca..4139df10d0f6ddd1cc6a76a995aca8ec351c4538 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,2 +1,3 @@
 Message from 5, Ben Received: Hello, 6
+Received: Hello, 6
 Sending Message to 7, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 05887b80e1b4ea50b11fbac9fd130315a3e8da2d..634534eaa2bbe82add4caa1af4fe415db6d90e86 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,2 +1,3 @@
 Message from 6, Steph Received: Hello, 7
+Received: Hello, 7
 Sending Message to 4, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 7611f0c3b5284c1e5566f01833b8c51675ef7137..3206400c8bc6f094e33060bce3f6095d260721b1 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,2 +1,2 @@
-Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
+Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 442987f2c69dc6f6a044d3c509d305212b83258e..7abafdd3da8a7bb0a1e68a2f45da44bf22241140 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -161,11 +161,12 @@ for C in $(ls -1 $CLIENTOUT); do
     cat $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
     # Take the clean lines and add them
     cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
+    cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true
 done
 
 # only expect up to 10c messages from the e2e clients
-head -10 $CLIENTCLEAN/client9_rekey.txt > $CLIENTCLEAN/client9.txt || true
-head -10 $CLIENTCLEAN/client18_rekey.txt > $CLIENTCLEAN/client18.txt || true
+head -10 $CLIENTCLEAN/client9_rekey.txt | grep -v "\.\.\." > $CLIENTCLEAN/client9.txt || true
+head -10 $CLIENTCLEAN/client18_rekey.txt | grep -v "\.\.\." > $CLIENTCLEAN/client18.txt || true
 rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
 
 for C in $(ls -1 $CLIENTCLEAN); do
diff --git a/basice2e/tmp b/basice2e/tmp
index 7611f0c3b5284c1e5566f01833b8c51675ef7137..3206400c8bc6f094e33060bce3f6095d260721b1 100644
--- a/basice2e/tmp
+++ b/basice2e/tmp
@@ -1,2 +1,2 @@
-Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
+Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption