diff --git a/src/client/Client.java b/src/client/Client.java
index df3c80670c03fd12276ee1503a18a0d7e2a36cf8..3edda911f8e581fa2eb7d576173e811ce6bb7abf 100644
--- a/src/client/Client.java
+++ b/src/client/Client.java
@@ -20,15 +20,13 @@ public class Client
     private Registry registryServer;
     private IChatController chatController;
     private IClientController clientController;
-
     private IDrawingController drawingController;
 
     private ClientUpdate clientUpdate;
-
     private ChatUpdate chatUpdate;
     private DrawingUpdate drawingUpdate;
-    private StartScreen startScreen;
 
+    private StartScreen startScreen;
     private ChatScreen chatScreen;
     private PaintGUI paintGUI;
 
@@ -41,12 +39,6 @@ public class Client
 
     public ChatScreen getChatScreen() { return chatScreen; }
 
-    public void setConnectedUsers(String[] users)
-    {
-        this.connectedUsers = users;
-    }
-
-
     public IChatController getChatController()
     {
         return chatController;
@@ -103,22 +95,6 @@ public class Client
         }
     }
 
-//    public void doSomething()
-//    {
-////        new ChatScreen();
-//
-//        try
-//        {
-//            new ChatScreen(this);
-//            System.out.println("Sleeping...");
-//            TimeUnit.MINUTES.sleep(5);
-//        }
-//        catch(Exception e)
-//        {
-//            e.printStackTrace();
-//        }
-//    }
-
     public boolean connect()
     {
         try
@@ -143,14 +119,4 @@ public class Client
 
         return false;
     }
-
-    public String getReceivedMessage()
-    {
-        return receivedMessage;
-    }
-
-    public void setReceivedMessage(String receivedMessage)
-    {
-        this.receivedMessage = receivedMessage;
-    }
 }
\ No newline at end of file