diff --git a/atrip.org b/atrip.org
index baf8a02..43ec364 100644
--- a/atrip.org
+++ b/atrip.org
@@ -2361,19 +2361,12 @@ Atrip::Output Atrip::run(Atrip::Input const& in) {
     }
 
       WITH_RANK << iteration << "-th cleaning up....... DONE\n";
-    }
 
-    // CLEAN CHRONO ======================================================{{{1
     chrono["iterations"].stop();
-    { // TODO: REMOVEME
-      chrono["oneshot-doubles"].clear();
-      chrono["oneshot-mpi:barrier"].clear();
-      chrono["oneshot-db:comm:allgather"].clear();
-      chrono["oneshot-unwrap"].clear();
-    }
-
     // ITERATION END ====================================================={{{1
-  }  // END OF MAIN LOOP
+
+  }
+    // END OF MAIN LOOP
 
   MPI_Barrier(universe);
 
diff --git a/src/atrip/Atrip.cxx b/src/atrip/Atrip.cxx
index 450b177..85fe35e 100644
--- a/src/atrip/Atrip.cxx
+++ b/src/atrip/Atrip.cxx
@@ -487,19 +487,12 @@ Atrip::Output Atrip::run(Atrip::Input const& in) {
     }
 
       WITH_RANK << iteration << "-th cleaning up....... DONE\n";
-    }
 
-    // CLEAN CHRONO ======================================================{{{1
     chrono["iterations"].stop();
-    { // TODO: REMOVEME
-      chrono["oneshot-doubles"].clear();
-      chrono["oneshot-mpi:barrier"].clear();
-      chrono["oneshot-db:comm:allgather"].clear();
-      chrono["oneshot-unwrap"].clear();
-    }
-
     // ITERATION END ====================================================={{{1
-  }  // END OF MAIN LOOP
+
+  }
+    // END OF MAIN LOOP
 
   MPI_Barrier(universe);