diff --git a/src/engine.c b/src/engine.c
index c01044d711a96d772f45bdf88eaf167887746def..6509b3ece8f53730325be34451d5ed587bddc99e 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -943,30 +943,32 @@ int engine_exchange_strays(struct engine *e, int offset, int *ind, int N) {
              sizeof(struct part) * p->nr_parts_in);
       memcpy(&s->xparts[offset + count], p->xparts_in,
              sizeof(struct xpart) * p->nr_parts_in);
-      for (int k = offset; k < offset + count; k++)
-        message(
+      /* for (int k = offset; k < offset + count; k++)
+         message(
             "received particle %lli, x=[%.3e %.3e %.3e], h=%.3e, from node %i.",
             s->parts[k].id, s->parts[k].x[0], s->parts[k].x[1],
-            s->parts[k].x[2], s->parts[k].h, p->nodeID);
+            s->parts[k].x[2], s->parts[k].h, p->nodeID); */
       count += p->nr_parts_in;
     }
   }
-
+    
   /* Wait for all the sends to have finnished too. */
-  if (nr_out > 0)
-    if (MPI_Waitall(2 * e->nr_proxies, reqs_out, MPI_STATUSES_IGNORE) !=
-        MPI_SUCCESS)
-      error("MPI_Waitall on sends failed.");
-
+  if ( nr_out > 0 )
+    if (MPI_Waitall(2 * e->nr_proxies , reqs_out , MPI_STATUSES_IGNORE) != 
+        MPI_SUCCESS )
+        error("MPI_Waitall on sends failed.");
+        
   /* Return the number of harvested parts. */
   return count;
-
+    
 #else
-  error("SWIFT was not compiled with MPI support.");
+  error( "SWIFT was not compiled with MPI support." );
   return 0;
 #endif
+
 }
 
+
 /**
  * @brief Fill the #space's task list.
  *
diff --git a/src/proxy.c b/src/proxy.c
index bafa185cdcaf2100992398657b650a954daceb91..257a11593d674a3f8a5674670ac3a12f203e1eb2 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -214,10 +214,10 @@ void proxy_parts_exch1(struct proxy *p) {
       error("Failed to isend part data.");
     // message( "isent particle data (%i) to node %i." , p->nr_parts_out ,
     // p->nodeID ); fflush(stdout);
-    for (int k = 0; k < p->nr_parts_out; k++)
+    /*for (int k = 0; k < p->nr_parts_out; k++)
       message("sending particle %lli, x=[%.3e %.3e %.3e], h=%.3e, to node %i.",
               p->parts_out[k].id, p->parts_out[k].x[0], p->parts_out[k].x[1],
-              p->parts_out[k].x[2], p->parts_out[k].h, p->nodeID);
+              p->parts_out[k].x[2], p->parts_out[k].h, p->nodeID);*/
   }
 
   /* Receive the number of particles. */