diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
index 1f0c5140..213d5e8e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
@@ -142,17 +142,18 @@ public class TraceManager implements Listener {
      *
      * @param trace the trace to be removed
      */
-    public boolean remove(Trace trace) {
+    public void remove(Trace trace) {
         Map<Integer, Trace> traces = tracesByRegion.getOrDefault(trace.getRegion(), Collections.emptyMap());
         Integer traceId = traces.entrySet().stream()
                 .filter(entry -> entry.getValue() == trace)
                 .map(Map.Entry::getKey)
                 .findFirst()
                 .orElse(null);
-        if (traceId == null) return false;
+        if (traceId == null) throw new RuntimeException("Trace not found while trying to remove see (c978eb98-b0b2-4009-91d8-acfa34e2831a)");
         traces.remove(traceId);
         trace.hide();
-        return true;
+        trace.getMetadataSaveFile().delete();
+        trace.getRecordsSaveFile().delete();
     }
 
     /**
@@ -171,8 +172,8 @@ public class TraceManager implements Listener {
         tracesByRegion.getOrDefault(region, new HashMap<>())
                 .forEach((i, trace) -> {
                     if (trace.getRegion() != region) return;
-                    trace.getMetadataSaveFile().deleteOnExit();
-                    trace.getRecordsSaveFile().deleteOnExit();
+                    trace.getMetadataSaveFile().delete();
+                    trace.getRecordsSaveFile().delete();
                 });
         tracesByRegion.getOrDefault(region, new HashMap<>()).clear();
     }