diff --git a/js/src/init.js b/js/src/init.js
index 50de4071..1e30b03e 100644
--- a/js/src/init.js
+++ b/js/src/init.js
@@ -60,8 +60,6 @@ class Initializer {
                     blip.description = (blip.hasOwnProperty("description") || blip.description != null) ? blip.description : "";
 
                     blip.type = spriteId;
-                    //TODO: Implement
-                    //createBlip(blip);
 
                     mapWrapper.createBlip(blip, markers.MarkerTypes);
 
diff --git a/js/src/map.js b/js/src/map.js
index 33c948ee..330571fd 100644
--- a/js/src/map.js
+++ b/js/src/map.js
@@ -198,25 +198,16 @@ class MapWrapper {
         }
 
         objectRef.position = Utils.stringCoordToFloat(objectRef.position);
-        //console.log(objectRef.position);
         let coord = Utils.convertToMapLeaflet(this.CurrentLayer, objectRef.position.x, objectRef.position.y);
-        //console.log(coord);
         let markerType = objectRef.type;
         const lang = window.Translator;
 
-        //console.log(JSON.stringify(locationType));
-
-
-        //TODO: TRANSLATE ENGLISH HERE
         let html = Utils.getPositionHtml(objectRef.position);
-        //let html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + objectRef.position.x.toFixed(2) + "} Y {" + objectRef.position.y.toFixed(2) + "} Z {" + objectRef.position.z.toFixed(2) + "}</div>";
 
         if (objectRef.description != "") {
-            //html += '<div class="row info-body-row"><strong>Description:</strong>&nbsp;' + objectRef.description + "</div>";
             html += Utils.getHtmlForInformation(lang.t("map.description"), objectRef.description);
         }
 
-        //let infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-header">' + name + '</div></div><div class="clear"></div><div class=info-body>' + html + "</div></div>";
         let infoContent = Utils.getInfoHtmlForMarkers(name, html);
 
         let image = L.icon(markerType);
diff --git a/js/src/socket.js b/js/src/socket.js
index 7439515e..6e49a2fa 100644
--- a/js/src/socket.js
+++ b/js/src/socket.js
@@ -18,7 +18,6 @@ class SocketHandler {
         this.localPlayerCache = {};
     }
 
-    //FIXME: We should pass a reference to mapWrapper here and call it's functions
     connect(connectionString, mapWrapper) {
         if (this.webSocket != null) { // Clean up the current websocket connection
             this.webSocket.close();
@@ -101,8 +100,6 @@ class SocketHandler {
     }
 
     onError(event) {
-        // TODO: Alert the user?
-
         new Alerter({
             title: window.Translator.t("errors.socket-error"),
             status: "error",