diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
index 7530831..80f8eb7 100644
--- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java
+++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
@@ -271,7 +271,6 @@ public class Game implements GameSpecification {
                 currentCarIndex++;
             }
         } while (track.getCar(currentCarIndex).isCrashed());
-        // TODO: evtl andere Kapselung
     }
 
     /**
diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Track.java b/src/main/java/ch/zhaw/pm2/racetrack/Track.java
index 0be8237..f0f6fdb 100644
--- a/src/main/java/ch/zhaw/pm2/racetrack/Track.java
+++ b/src/main/java/ch/zhaw/pm2/racetrack/Track.java
@@ -123,7 +123,6 @@ public class Track implements TrackSpecification {
         }
 
     }
-    //TODO: THIS
 
     /**
      *  Determines the finish line and saves it in a list, throws an Exception if none is found.