diff --git a/statemachine/src/main/jastadd/mapping/SMtoDG.jrag b/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
index 32a0555adbe86a44cd0d225ff43dd339e9b3effa..cab48b19961da50bab6a9cb574378001968b7714 100644
--- a/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
+++ b/statemachine/src/main/jastadd/mapping/SMtoDG.jrag
@@ -1,7 +1,6 @@
 aspect SMtoDG {
   syn DependencyGraph StateMachine.dependencyGraph() {
     DependencyGraph dg = new DependencyGraph();
-
     dg.setStateMachine(this);
 
     Map<State,Component> componentMap = new HashMap<>();
@@ -15,13 +14,8 @@ aspect SMtoDG {
     for (Transition t: transitions()) {
       Component to = componentMap.get(t.getTo());
       Component from = componentMap.get(t.getFrom());
+      from.addTo(to);
 
-      //if (!from.getToList().contains(to)) {
-        logger.info("adding {} -> {}", from, to);
-
-        from.addTo(to);
-
-      //}
     }
     return dg;
   }
diff --git a/statemachine/src/main/jastadd/mapping/SMtoDG.relast b/statemachine/src/main/jastadd/mapping/SMtoDG.relast
index 7d95fca51e08e1d5dc5d217642b6be3bae77e438..85028329609cacaab8b0ee5e317aebefda98eba0 100644
--- a/statemachine/src/main/jastadd/mapping/SMtoDG.relast
+++ b/statemachine/src/main/jastadd/mapping/SMtoDG.relast
@@ -1,2 +1,2 @@
+rel DependencyGraph.StateMachine -> StateMachine;
 rel Component.State -> State;
-rel DependencyGraph.StateMachine? -> StateMachine;