diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 604694e1..3e88b7f2 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -423,7 +423,6 @@ public class GameState implements Runnable {
     private void checkForLegProgression(ServerYacht yacht) {
         Integer currentMarkSeqID = yacht.getCurrentMarkSeqID();
         CompoundMark currentMark = markOrder.getCurrentMark(currentMarkSeqID);
-//        System.out.println(yacht.getCurrentMarkSeqID());
 
         Boolean hasProgressed;
         if (currentMarkSeqID == 0) {
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 088fbd14..75907275 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -192,7 +192,6 @@ public class ServerToClientThread implements Runnable, Observer {
                     long computedCrc = checksum.getValue();
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
-                        //System.out.println("RECEIVED A PACKET");
                         switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
                                 BoatAction actionType = ServerPacketParser
@@ -229,7 +228,11 @@ public class ServerToClientThread implements Runnable, Observer {
         }
 
         //@TODO calculate lat/lng values
-        xml.setRegatta(new Regatta("Party Parrot Test Server", "Bermuda Test Course",  57.6679590, 11.8503233));
+        xml.setRegatta(
+            new Regatta(
+                "Party Parrot Test Server", "Bermuda Test Course",
+                57.6679590, 11.8503233)
+        );
         xml.setRace(race);
 
         XMLMessage xmlMessage;
@@ -289,8 +292,7 @@ public class ServerToClientThread implements Runnable, Observer {
         try {
             os.write(message.getBuffer());
         } catch (SocketException e) {
-            //serverLog("Player " + sourceId + " side socket disconnected", 1);
-            return;
+            logger.warn("Player " + sourceId + " side socket disconnected", 1);
         } catch (IOException e) {
             logger.warn("Message send failed", 1);
         }
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index b4c690c8..7c762c85 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -410,7 +410,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         List<Text> vboxEntries = new ArrayList<>();
 
         for (int i = 0; i < yachts.size(); i++) {
-//            System.out.println("yacht == null  " + String.valueOf(yacht == null));
             if (yachts.get(i).getBoatStatus() == 3) {  // 3 is finish status
                 Text textToAdd = new Text(i + 1 + ". " +
                     yachts.get(i).getShortName() + " (Finished)");
diff --git a/src/main/java/seng302/visualiser/fxObjects/Marker.java b/src/main/java/seng302/visualiser/fxObjects/Marker.java
index 64923b51..297a9c34 100644
--- a/src/main/java/seng302/visualiser/fxObjects/Marker.java
+++ b/src/main/java/seng302/visualiser/fxObjects/Marker.java
@@ -49,17 +49,13 @@ public class Marker extends Group {
      */
     public void addArrows(MarkArrowFactory.RoundingSide roundingSide, double entryAngle,
         double exitAngle) {
-
+        //Change Color.GRAY to this.colour to revert all gray arrows.
         enterArrows.add(
-            MarkArrowFactory.constructEntryArrow(roundingSide, entryAngle, exitAngle, colour)
+            MarkArrowFactory.constructEntryArrow(roundingSide, entryAngle, exitAngle, Color.GRAY)
         );
         exitArrows.add(
-            MarkArrowFactory.constructExitArrow(roundingSide, exitAngle, colour)
+            MarkArrowFactory.constructExitArrow(roundingSide, exitAngle, Color.GRAY)
         );
-//        Platform.runLater(() -> {
-//            this.getChildren().add(enterArrows.get(enterArrows.size()-1));
-//            this.getChildren().add(exitArrows.get(exitArrows.size()-1));
-//        });
     }
 
     /**
diff --git a/src/test/java/seng302/utilities/GeoUtilityTest.java b/src/test/java/seng302/utilities/GeoUtilityTest.java
index a9a60148..936b5983 100644
--- a/src/test/java/seng302/utilities/GeoUtilityTest.java
+++ b/src/test/java/seng302/utilities/GeoUtilityTest.java
@@ -140,7 +140,6 @@ public class GeoUtilityTest {
 //        for (int i = 0; i < 100000; i++) {
 //            assertTrue(GeoUtility.isPointInTriangle(v1, v2, v3, p1));
 //        }
-//        System.out.println((System.nanoTime() - startTime) / 1000000000.0);
 
         // test for different orders of vertices, which should not affect the result
         assertTrue(GeoUtility.isPointInTriangle(v2, v1, v3, p1));