diff --git a/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java b/framework/src/main/java/org/toop/framework/networking/server/ConnectionHandler.java
similarity index 92%
rename from framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java
rename to framework/src/main/java/org/toop/framework/networking/server/ConnectionHandler.java
index 48bc77e..8c20f32 100644
--- a/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java
+++ b/framework/src/main/java/org/toop/framework/networking/server/ConnectionHandler.java
@@ -9,12 +9,12 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-public class ServerHandler extends SimpleChannelInboundHandler<String> {
+public class ConnectionHandler extends SimpleChannelInboundHandler<String> {
 
     private final User user;
     private final Server server;
 
-    public ServerHandler(User user, Server server) {
+    public ConnectionHandler(User user, Server server) {
         this.user = user;
         this.server = server;
     }
@@ -54,19 +54,19 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
         }
     }
 
+    // DO NOT INVERT
     private boolean hasArgs(String... args) {
         return (args.length >= 1);
     }
 
     private void handleLogin(ParsedMessage p) {
-
-        if (hasArgs(p.args())) return;
+        if (!hasArgs(p.args())) return;
 
         user.setName(p.args()[0]);
     }
 
     private void handleGet(ParsedMessage p) {
-        if (hasArgs(p.args())) return;
+        if (!hasArgs(p.args())) return;
 
         switch (p.args()[0]) {
             case "playerlist" -> {
@@ -93,7 +93,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
     }
 
     private void handleChallenge(ParsedMessage p) {
-        if(hasArgs(p.args())) return;
+        if (!hasArgs(p.args())) return;
         if (p.args().length < 2) return;
 
         if (p.args()[0].equalsIgnoreCase("accept")) {
@@ -118,7 +118,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
     }
 
     private void handleMove(ParsedMessage p) {
-        if(hasArgs(p.args())) return;
+        if(!hasArgs(p.args())) return;
 
         // TODO check if not number
         user.serverPlayer().setMove(1L << Integer.parseInt(p.args()[0]));
diff --git a/framework/src/main/java/org/toop/framework/networking/server/MasterServer.java b/framework/src/main/java/org/toop/framework/networking/server/MasterServer.java
index 587a569..4259fcd 100644
--- a/framework/src/main/java/org/toop/framework/networking/server/MasterServer.java
+++ b/framework/src/main/java/org/toop/framework/networking/server/MasterServer.java
@@ -12,7 +12,6 @@ import io.netty.handler.codec.string.StringEncoder;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 import org.toop.framework.SnowflakeGenerator;
-import org.toop.framework.game.BitboardGame;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 
 import java.time.Duration;
@@ -53,7 +52,7 @@ public class MasterServer {
 
                             long userid = SnowflakeGenerator.nextId();
                             User user = new User(userid, ""+userid);
-                            pipeline.addLast(new ServerHandler(user, gs));
+                            pipeline.addLast(new ConnectionHandler(user, gs));
                         }
                     }
             );
diff --git a/framework/src/main/java/org/toop/framework/networking/server/Server.java b/framework/src/main/java/org/toop/framework/networking/server/Server.java
index bc8742a..4da5c4c 100644
--- a/framework/src/main/java/org/toop/framework/networking/server/Server.java
+++ b/framework/src/main/java/org/toop/framework/networking/server/Server.java
@@ -168,13 +168,6 @@ public class Server implements GameServer {
         } catch (Exception ignored) {}
     }
 
-//    public void checkGames() {
-//        for (int i = games.size() - 1; i >= 0; i--) {
-//            var game = games.get(i);
-//            if (game.game().getWinner() >= 0) games.remove(i);
-//        }
-//    }
-
     public List<User> onlineUsers() {
         return users.values().stream().toList();
     }