diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/ASTNodeDeserializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/ASTNodeDeserializer.java
index 7ab20e193787dbae3768c0273ff34958db9da2b9..e2543bd637c327792b66fbcfe125987c19180334 100644
--- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/ASTNodeDeserializer.java
+++ b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/ASTNodeDeserializer.java
@@ -31,7 +31,6 @@ public class ASTNodeDeserializer extends StdDeserializer<ASTNode> {
   private java.util.List<SensorRef> sensorRefList = new ArrayList<>();
   private java.util.List<SemaphoreRef> semaphoreRefList = new ArrayList<>();
   private java.util.List<SwitchRef> switchRefList = new ArrayList<>();
-  private java.util.List<TrackElementRef> trackElementRefList = new ArrayList<>();
   private java.util.List<SegmentRef> segmentRefList = new ArrayList<>();
 
   @Override
@@ -80,12 +79,6 @@ public class ASTNodeDeserializer extends StdDeserializer<ASTNode> {
     }
   }
 
-  private Ref deserializeRef(JsonNode node) {
-    final String packageName = "de.tudresden.inf.st.train.jastadd.ast";
-
-    return null;
-  }
-
   private ASTNode deserializeNonterminal(JsonNode node) {
 
     final String packageName = "de.tudresden.inf.st.train.jastadd.ast";
diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSemaphoreNeighbor.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSemaphoreNeighbor.java
index 8fc8a514ecf13bea6d3d88a150a404b0c7cb6b9c..0a3bb8d3c275df0a8d95d6ec34be1bba5ede0334 100644
--- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSemaphoreNeighbor.java
+++ b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSemaphoreNeighbor.java
@@ -17,7 +17,7 @@ public class JastaddTransformationInjectSemaphoreNeighbor<TJastaddDriver extends
   @Override
   public void activate(final Collection<JastaddSemaphoreNeighborInjectMatch> matches) {
     for (final JastaddSemaphoreNeighborInjectMatch match : matches) {
-      match.getRoute().setEntry(null);
+      match.getRoute().clearEntry();
     }
     driver.flushCache();
   }
diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSwitchMonitored.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSwitchMonitored.java
index 96b8bfd2a106fc762e7487a50d34a7ee7df43baf..d4b56dc46b402a34e899a30676b1979de171b622 100644
--- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSwitchMonitored.java
+++ b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/transformations/inject/JastaddTransformationInjectSwitchMonitored.java
@@ -1,9 +1,6 @@
 package de.tudresden.inf.st.train.jastadd.transformations.inject;
 
-import de.tudresden.inf.st.train.jastadd.ast.List;
-import de.tudresden.inf.st.train.jastadd.ast.Switch;
 import de.tudresden.inf.st.train.jastadd.ast.Sensor;
-import de.tudresden.inf.st.train.jastadd.ast.TrackElement;
 import de.tudresden.inf.st.train.jastadd.driver.JastaddDriver;
 import de.tudresden.inf.st.train.jastadd.matches.JastaddSwitchMonitoredInjectMatch;
 import de.tudresden.inf.st.train.jastadd.transformations.JastaddTransformation;