diff --git a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
index f6e6f19c02f974e07f8fd4b4edaa7969252e3741..946956482c2301c96b33d97e9ea79edce1153b6c 100644
--- a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+++ b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
@@ -179,5 +179,5 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
   //   Generate_CTest_Dependency_File(depFile);
   // ------------------------------------------------------------------------
 
-  //  RemoveGeoManager();
+  RemoveGeoManager();
 }
diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C
index 0ee142fc0ee07c39fdc0dc192055a2f022e086cc..e478cba99ff056867b83c5dea7f13dc9fe302c51 100644
--- a/macro/much/run_ana.C
+++ b/macro/much/run_ana.C
@@ -101,5 +101,5 @@ void run_ana(Int_t nEvents = 1000, TString dataSet = "muons", TString setup = "s
   cout << " Test passed" << endl;
   cout << " All ok " << endl;
 
-  //   RemoveGeoManager();
+  RemoveGeoManager();
 }
diff --git a/macro/tof/digitizer/run_tof_disim.C b/macro/tof/digitizer/run_tof_disim.C
index 367661b7765de75caceff6e7973e7f5f95ed984d..680715dd27bc27d9fe838624e3c0ddd20c943e09 100644
--- a/macro/tof/digitizer/run_tof_disim.C
+++ b/macro/tof/digitizer/run_tof_disim.C
@@ -227,4 +227,6 @@ void run_tof_disim(Int_t nEvents = 2, const char* setup = "sis100_electron")
 
   cout << " Test passed" << endl;
   cout << " All ok " << endl;
+
+  RemoveGeoManager();
 }