diff --git a/monticore-generator/src/main/java/de/monticore/gradle/gen/MCToolInvoker.java b/monticore-generator/src/main/java/de/monticore/gradle/gen/MCToolInvoker.java
index 3d9162e14e..90f185feed 100644
--- a/monticore-generator/src/main/java/de/monticore/gradle/gen/MCToolInvoker.java
+++ b/monticore-generator/src/main/java/de/monticore/gradle/gen/MCToolInvoker.java
@@ -2,6 +2,7 @@
 package de.monticore.gradle.gen;
 
 import de.monticore.AmbiguityException;
+import de.monticore.cd.methodtemplates.CD4C;
 import de.monticore.generating.templateengine.freemarker.MontiCoreFreeMarkerException;
 import de.monticore.generating.templateengine.reporting.Reporting;
 import de.monticore.grammar.MCGrammarSymbolTableHelper;
@@ -50,8 +51,11 @@ public static void run(String[] args) {
       MCBasicsMill.globalScope().clear();
       MCBasicsMill.globalScope().clearLoadedFiles();
       MCBasicsMill.globalScope().getSymbolPath().close();
+      CD4C.reset();
       Grammar_WithConceptsMill.reset();
       Reporting.resetInitializedFlagFix();
+      Reporting.clearReportHooks();
+      Log.internalRemove();
     }
   }
 }