diff --git a/examples/EAGLE_25/eagle_25.yml b/examples/EAGLE_25/eagle_25.yml
index 67da3cdfd85aa1ad888dcc5c077d9b16658a1101..c01abfe94b98e8366ac05f1e3bce50a3931738c5 100644
--- a/examples/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_25/eagle_25.yml
@@ -13,6 +13,9 @@ TimeIntegration:
   dt_min:     1e-10 # The minimal time-step size of the simulation (in internal units).
   dt_max:     1e-4  # The maximal time-step size of the simulation (in internal units).
 
+Scheduler:
+  max_top_level_cells:    20
+
 # Parameters governing the snapshots
 Snapshots:
   basename:            eagle # Common part of the name of output files
diff --git a/src/engine.c b/src/engine.c
index a8ad3af1e64cd82ad2dda876e1543c73e8c9e4df..0eff5d50ebc5488a28465384a45fa469b26cfe59 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3416,8 +3416,6 @@ int engine_marktasks(struct engine *e) {
   const ticks tic = getticks();
   int rebuild_space = 0;
 
-  message("marktask");
-
   /* Run through the tasks and mark as skip or not. */
   size_t extra_data[3] = {(size_t)e, rebuild_space, (size_t)&e->sched};
   threadpool_map(&e->threadpool, engine_marktasks_mapper, s->tasks, s->nr_tasks,
@@ -4312,8 +4310,8 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
   if (e->verbose) message("took %.3f %s.", e->wallclock_time, clocks_getunit());
 }
 
-integertime_t *address_hydro = 0;
-integertime_t *address_gravity = 0;
+/* integertime_t *address_hydro = 0; */
+/* integertime_t *address_gravity = 0; */
 
 /**
  * @brief Let the #engine loose to compute the forces.
@@ -4510,8 +4508,6 @@ void engine_unskip(struct engine *e) {
 
   const ticks tic = getticks();
 
-  message("unskip");
-
   /* Activate all the regular tasks */
   threadpool_map(&e->threadpool, runner_do_unskip_mapper, e->s->local_cells_top,
                  e->s->nr_local_cells, sizeof(int), 1, e);