diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
index 20c337b..1db7ca8 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
@@ -110,7 +110,6 @@ public class Client {
   public void closeEverything(Socket socket, BufferedReader in, BufferedWriter out) {
     //TODO Correctly closing a clients connection
 
-    // Is this not already correct?
     try {
       if (in != null) {
         in.close();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
index 6262d16..6b58179 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
@@ -126,8 +126,6 @@ public class ClientHandler implements Runnable {
     }
   }
 
-  //TODO: Documentation
-
   /** Sends a given message to client
    *
    * @param msg the given message
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java
index 4f13056..4bcc58a 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java
@@ -30,17 +30,13 @@ public class Server {
         connectedClients.add(nextClient);
         th.start();
         // close socket + remove client if client is disconnected
-        if (socket.getInputStream().read() == -1) {
+        /* TODO: Modify or remove this disconnection handling - right now, it is not functioning
+            (when disconnecting there are "broken pipe" exceptions on client side and "stream closed"
+            exceptions on the server side).
+         */
+        if (nextClient.getSocket().getInputStream().read() == -1) {
           System.out.println("client disconnected. closing socket");
           socket.close();
-          connectedClients.remove(nextClient);
-        }
-
-        // close socket + remove client if client is disconnected
-        if (socket.getInputStream().read() == -1) {
-          System.out.println("client disconnected. closing socket");
-          socket.close();
-          connectedClients.remove(nextClient);
         }
       }
     } catch (IOException e) {