diff --git a/src/main/java/seng302/Model/BoatInRace.java b/src/main/java/seng302/Model/BoatInRace.java
index 4d86b201..65a998c6 100644
--- a/src/main/java/seng302/Model/BoatInRace.java
+++ b/src/main/java/seng302/Model/BoatInRace.java
@@ -265,9 +265,6 @@ public class BoatInRace extends Boat {
             nextValidTime = currentTime + TRACK_POINT_TIME_INTERVAL;
             track.add(new TrackPoint(coordinate, currentTime, TRACK_POINT_LIMIT * TRACK_POINT_TIME_INTERVAL));
         }
-        if (track.size() > 0 && track.element().getTimeAdded() + TRACK_POINT_LIMIT * TRACK_POINT_TIME_INTERVAL <= currentTime) {
-            track.remove();
-        }
         return added;
     }
 
diff --git a/src/main/java/seng302/Model/TrackPoint.java b/src/main/java/seng302/Model/TrackPoint.java
index fe898417..6a28bd22 100644
--- a/src/main/java/seng302/Model/TrackPoint.java
+++ b/src/main/java/seng302/Model/TrackPoint.java
@@ -23,9 +23,6 @@ public class TrackPoint {
     }
 
     public double getAlpha() {
-        if (System.currentTimeMillis() >= timeAdded + expiry) {
-            return 0;
-        }
         return Double.max(minAlpha,1.0 - (double)(System.currentTimeMillis() - timeAdded) / expiry);
     }