diff --git a/src/const.h b/src/const.h
index 4b46ec1cb094f8bae630e432bf4a75469357ca9b..c290a3e73a524e9003cadb63f8bd45e8b3c51dac 100644
--- a/src/const.h
+++ b/src/const.h
@@ -59,6 +59,4 @@
 #define SOURCETERMS_NONE
 //#define SOURCETERMS_SN_FEEDBACK
 
-#define ICHECK -116650
-
 #endif /* SWIFT_CONST_H */
diff --git a/src/gravity/Default/gravity_part.h b/src/gravity/Default/gravity_part.h
index cd16287db6a57d9e62ae4f981501208785894a7f..18d524d39f86f363df2a8ad7ce6638f438bdb477 100644
--- a/src/gravity/Default/gravity_part.h
+++ b/src/gravity/Default/gravity_part.h
@@ -44,12 +44,6 @@ struct gpart {
   /* Softening length */
   float epsilon;
 
-  /* Particle time of beginning of time-step. */
-  // int ti_begin;
-
-  /* Particle time of end of time-step. */
-  // int ti_end;
-
   /* Time-step length */
   timebin_t time_bin;
 
diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h
index f10d72b90b8e7686bb1aa55e78229887ccfa4e3c..56162055f4f200aff376306d121e7cd24a5cd79b 100644
--- a/src/hydro/Gadget2/hydro_part.h
+++ b/src/hydro/Gadget2/hydro_part.h
@@ -71,12 +71,6 @@ struct part {
   /* Particle mass. */
   float mass;
 
-  /* Particle time of beginning of time-step. */
-  // int ti_begin;
-
-  /* Particle time of end of time-step. */
-  // int ti_end;
-
   /* Particle density. */
   float rho;
 
diff --git a/src/runner.c b/src/runner.c
index b7c7129f25ed70abbd1c35d577c906b2ff08c6de..d3b067f177a4f1eef4a070d926f93ba85db15b74 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -896,8 +896,8 @@ void runner_do_kick1(struct runner *r, struct cell *c, int timer) {
 /**
  * @brief Perform the second half-kick on all the active particles in a cell.
  *
- * Also computes the next time-step of all active particles, prepare them to be 
- * drifted and update the cell's statistics. 
+ * Also computes the next time-step of all active particles, prepare them to be
+ * drifted and update the cell's statistics.
  *
  * @param r The runner thread.
  * @param c The cell.
diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 9d2606ceb06fd6d32592010376e867a6ae582bf0..59a5ae496680390c23458bde65b4bba321ffe7a1 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -25,6 +25,8 @@
 #include "gravity.h"
 #include "part.h"
 
+#define ICHECK -1000
+
 /**
  * @brief Compute the recursive upward sweep, i.e. construct the
  *        multipoles in a cell hierarchy.