diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/repair/JastaddTransformationRepairConnectedSegments.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/repair/JastaddTransformationRepairConnectedSegments.java
index 14be6d3b982c1aea69f2122863bac963fdf33909..203802332c2faa92b15e332e0f61b9494a76cf1b 100644
--- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/repair/JastaddTransformationRepairConnectedSegments.java
+++ b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/repair/JastaddTransformationRepairConnectedSegments.java
@@ -24,16 +24,11 @@ public class JastaddTransformationRepairConnectedSegments<TJastaddDriver extends
       java.util.List<Sensor> sensorsToRemoveSegmentFrom = new java.util.ArrayList<>();
 
       // delete all references to segment2 (monitoring sensors and other segments connecting to it)
+      segment2.monitoredBy().clear();
+
       for (Region region : driver.getModel().getRegionList()) {
-        for (Sensor sensor : region.getSensorList()) {
-          if (sensor.getMonitoredElementList().contains(segment2)) {
-            sensor.removeMonitoredElement(segment2);
-          }
-        }
         for (TrackElement element : region.getTrackElementList()) {
-          if (element.getConnectsToList().contains(segment2)) {
-            element.removeConnectsTo(segment2);
-          }
+          element.removeConnectsTo(segment2);
         }
       }