diff --git a/neurodamus/node.py b/neurodamus/node.py
index 73bda64e..26826fcb 100644
--- a/neurodamus/node.py
+++ b/neurodamus/node.py
@@ -1526,11 +1526,12 @@ def cleanup(self):
         """Have the compute nodes wrap up tasks before exiting.
         """
         # MemUsage constructor will do MPI communications
-        print_mem_usage()
+        # print_mem_usage()
 
         # Coreneuron runs clear the model before starting
-        if not SimConfig.use_coreneuron or SimConfig.simulate_model is False:
-            self.clear_model(avoid_creating_objs=True)
+        # TODO: Why explicitly cleanup structures before exiting?
+        # if not SimConfig.use_coreneuron or SimConfig.simulate_model is False:
+        #     self.clear_model(avoid_creating_objs=True)
 
         if SimConfig.delete_corenrn_data and not SimConfig.dry_run:
             with timeit(name="Delete corenrn data"):
@@ -1567,7 +1568,6 @@ class Neurodamus(Node):
     def __init__(
         self, config_file,
         auto_init=True,
-        cleanup_atexit=True,
         logging_level=None,
         **user_opts
     ):