diff --git a/CommonCore b/CommonCore
index 6cb3bc5..3701f6f 160000
--- a/CommonCore
+++ b/CommonCore
@@ -1 +1 @@
-Subproject commit 6cb3bc5ff5ee955ccdde281183991d0877e54169
+Subproject commit 3701f6f5ff10fa97d6816d5f57c85f7213f7fb3e
diff --git a/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java b/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java
deleted file mode 100644
index 531031c..0000000
--- a/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.command;
-
-import org.bukkit.command.CommandSender;
-
-@FunctionalInterface
-public interface GuardChecker extends AbstractGuardChecker<CommandSender> {
-    /**
-     * While guarding the first parameter of the command the parameter s of this method is {@code null}
-     */
-    GuardResult guard(CommandSender commandSender, GuardCheckType guardCheckType, String[] previousArguments, String s);
-}
diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 2c5c433..cee412d 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -132,7 +132,7 @@ public class SWCommand extends AbstractSWCommand<CommandSender> {
         }
         if (args.length == 0 || atomicInteger.get() == commandList.size()) {
             commandList.forEach(subCommand -> {
-                if (subCommand.guardChecker == null || subCommand.guardChecker.guard(p, GuardCheckType.TAB_COMPLETE, new String[0], null) == GuardResult.ALLOWED) {
+                if (subCommand.validator == null || subCommand.validator.validate(p, p, (s, args1) -> {})) {
                     send(p, subCommand);
                 }
             });
diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
index b98ea77..11e403b 100644
--- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
+++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
@@ -26,6 +26,4 @@ public interface ScoreboardCallback {
     HashMap<String, Integer> getData();
 
     String getTitle();
-
-
 }