diff --git a/cicaprojekt/ApplicationFrame.java b/cicaprojekt/ApplicationFrame.java
index d70b58f..ef377f3 100644
--- a/cicaprojekt/ApplicationFrame.java
+++ b/cicaprojekt/ApplicationFrame.java
@@ -61,8 +61,6 @@ public class ApplicationFrame implements Runnable
         
 
         jframe.add(mapselectorpanel);
-
-        // TODO add Ejik's magic to gamepanel
     }
 
     @Override
diff --git a/cicaprojekt/Stargate.java b/cicaprojekt/Stargate.java
index 9895cc0..a51e915 100644
--- a/cicaprojekt/Stargate.java
+++ b/cicaprojekt/Stargate.java
@@ -9,7 +9,7 @@ public class Stargate {
     public static final Stargate blueStargate = new Stargate("Blue Stargate");
     public static final Stargate redStargate = new Stargate("Red Stargate");
     public static final Stargate greenStargate = new Stargate("Green Stargate");
-    public /*final*/ Stargate other; //TODO find better ways to do this
+    public Stargate other;
     private boolean isSpawned;
     private Wall currentWall;
     private String name;