diff --git a/SpigotCore_Main/src/de/steamwar/command/Argument.java b/SpigotCore_Main/src/de/steamwar/command/Argument.java
index d481f12..0fe920d 100644
--- a/SpigotCore_Main/src/de/steamwar/command/Argument.java
+++ b/SpigotCore_Main/src/de/steamwar/command/Argument.java
@@ -16,7 +16,6 @@
  *
  *     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;
diff --git a/SpigotCore_Main/src/de/steamwar/command/ArgumentMap.java b/SpigotCore_Main/src/de/steamwar/command/ArgumentMap.java
index 1d3e51f..ba046a7 100644
--- a/SpigotCore_Main/src/de/steamwar/command/ArgumentMap.java
+++ b/SpigotCore_Main/src/de/steamwar/command/ArgumentMap.java
@@ -15,8 +15,7 @@
  *     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/>.
- * /
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
 
 package de.steamwar.command;
diff --git a/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java b/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
index 6ab22dd..5301d9e 100644
--- a/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
+++ b/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
@@ -16,7 +16,6 @@
  *
  *     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;
diff --git a/SpigotCore_Main/src/de/steamwar/command/Executor.java b/SpigotCore_Main/src/de/steamwar/command/Executor.java
index 26d6bdc..28fff3e 100644
--- a/SpigotCore_Main/src/de/steamwar/command/Executor.java
+++ b/SpigotCore_Main/src/de/steamwar/command/Executor.java
@@ -16,7 +16,6 @@
  *
  *     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;
diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 95d0d27..34159e9 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -16,7 +16,6 @@
  *
  *     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;
diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java b/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java
index d3e2590..52ce3fd 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java
@@ -16,7 +16,6 @@
  *
  *     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;
@@ -25,7 +24,6 @@ import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class SWCommandBundle {
 
diff --git a/SpigotCore_Main/src/de/steamwar/commandn/Argument.java b/SpigotCore_Main/src/de/steamwar/commandn/Argument.java
deleted file mode 100644
index 92eb7d4..0000000
--- a/SpigotCore_Main/src/de/steamwar/commandn/Argument.java
+++ /dev/null
@@ -1,53 +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.commandn;
-
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-import java.util.function.BiPredicate;
-
-public interface Argument<T> {
-
-    T parse(String arg) throws InvalidArgumentException;
-    void checkConstraints(CommandSender sender, T argument) throws InvalidArgumentException;
-
-    List<String> tabComplete(CommandSender sender, String arg) throws InvalidArgumentException;
-    default BiPredicate<String, String> tabCompleteFilter() {
-        return String::startsWith;
-    }
-
-    abstract class IntArgument implements Argument<Integer> {
-        @Override
-        public Integer parse(String arg) {
-            return Integer.parseInt(arg);
-        }
-    }
-
-    abstract class DoubleArgument implements Argument<Double> {
-        @Override
-        public Double parse(String arg) {
-            return Double.parseDouble(arg);
-        }
-    }
-
-}
diff --git a/SpigotCore_Main/src/de/steamwar/commandn/InvalidArgumentException.java b/SpigotCore_Main/src/de/steamwar/commandn/InvalidArgumentException.java
deleted file mode 100644
index 4c0fd78..0000000
--- a/SpigotCore_Main/src/de/steamwar/commandn/InvalidArgumentException.java
+++ /dev/null
@@ -1,26 +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.commandn;
-
-public class InvalidArgumentException extends Exception {
-
-}