diff --git a/server/src/main/java/org/allaymc/server/command/defaults/KickCommand.java b/server/src/main/java/org/allaymc/server/command/defaults/KickCommand.java
index 73c3e8422..c229ee49b 100644
--- a/server/src/main/java/org/allaymc/server/command/defaults/KickCommand.java
+++ b/server/src/main/java/org/allaymc/server/command/defaults/KickCommand.java
@@ -18,7 +18,7 @@ public KickCommand() {
     @Override
     public void prepareCommandTree(CommandTree tree) {
         tree.getRoot()
-                // TODO: Should use target(), but target() can only match players in default world
+                // TODO: Should use target(), but target() can only match players in sender's world
                 .str("player")
                 .str("reason", "You are kicked")
                 .optional()
diff --git a/server/src/main/java/org/allaymc/server/command/tree/AllayCommandTree.java b/server/src/main/java/org/allaymc/server/command/tree/AllayCommandTree.java
index 9d4ad431f..999be03b6 100644
--- a/server/src/main/java/org/allaymc/server/command/tree/AllayCommandTree.java
+++ b/server/src/main/java/org/allaymc/server/command/tree/AllayCommandTree.java
@@ -50,7 +50,6 @@ public CommandResult parse(CommandSender sender, String[] args) {
     protected CommandResult parse0(CommandNode node, CommandContext context) {
         if (node.isLeaf()) {
             if (context.haveUnhandledArg()) {
-                // TODO
                 context.addSyntaxError();
                 return context.fail();
             }