diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 00e7d4a2822bb19f4e303de7e94be227e7ec82cf..eed946bfa192ba1973408f7021d26ab8e46615b8 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -59,7 +59,9 @@ static INLINE void runner_do_grav_down(struct runner *r, struct cell *c,
     error("c->field tensor not initialised");
 #endif
 
-  if (c->split) { /* Node case */
+  if (c->split) {
+
+    /* Node case */
 
     /* Add the field-tensor to all the 8 progenitors */
     for (int k = 0; k < 8; ++k) {
@@ -92,7 +94,9 @@ static INLINE void runner_do_grav_down(struct runner *r, struct cell *c,
       }
     }
 
-  } else { /* Leaf case */
+  } else {
+
+    /* Leaf case */
 
     /* We can abort early if no interactions via multipole happened */
     if (!c->multipole->pot.interacted) return;
@@ -166,14 +170,12 @@ static INLINE void runner_dopair_grav_mm(struct runner *r,
   if (cj->ti_old_multipole != e->ti_current)
     error(
         "Undrifted multipole cj->ti_old_multipole=%lld cj->nodeID=%d "
-        "ci->nodeID=%d "
-        "e->ti_current=%lld",
+        "ci->nodeID=%d e->ti_current=%lld",
         cj->ti_old_multipole, cj->nodeID, ci->nodeID, e->ti_current);
 
   /* Let's interact at this level */
-  if (0)
-    gravity_M2L(&ci->multipole->pot, multi_j, ci->multipole->CoM,
-                cj->multipole->CoM, props, periodic, dim, r_s_inv);
+  gravity_M2L(&ci->multipole->pot, multi_j, ci->multipole->CoM,
+              cj->multipole->CoM, props, periodic, dim, r_s_inv);
 
   runner_dopair_grav_pp(r, ci, cj, 0);
 
@@ -874,7 +876,8 @@ static INLINE void runner_dopair_grav_pp(struct runner *r, struct cell *ci,
  *
  * @param e The #engine (for debugging checks only).
  * @param gparts The #gpart in the cell (for debugging checks only).
- */ static INLINE void runner_doself_grav_pp_full(
+ */
+static INLINE void runner_doself_grav_pp_full(
     struct gravity_cache *restrict ci_cache, const int gcount,
     const int gcount_padded, const struct engine *e, struct gpart *gparts) {
   /* Loop over all particles in ci... */
diff --git a/src/space.c b/src/space.c
index eb195040f878c7300ac8c2aa121b076330ede124..83fae9fbd454c8b437cacf80e7e81f9d2284e24a 100644
--- a/src/space.c
+++ b/src/space.c
@@ -2591,14 +2591,9 @@ void space_convert_quantities_mapper(void *restrict map_data, int count,
   struct part *restrict parts = (struct part *)map_data;
   const ptrdiff_t index = parts - s->parts;
   struct xpart *restrict xparts = s->xparts + index;
-  for (int k = 0; k < count; k++) {
-
-    if (parts[k].id == 1000) message("S (u) = %e", parts[k].entropy);
 
+  for (int k = 0; k < count; k++)
     hydro_convert_quantities(&parts[k], &xparts[k], cosmo);
-
-    if (parts[k].id == 1000) message("S = %e", parts[k].entropy);
-  }
 }
 
 /**