diff --git a/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java b/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java
deleted file mode 100644
index 32f331f..0000000
--- a/FightSystem_10/src/de/steamwar/fightsystem/fight/Fight_10.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import org.bukkit.entity.Player;
-
-public class Fight_10 {
-
-    private Fight_10() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        Fight_8.hidePlayer(target, toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        Fight_8.showPlayer(target, toShow);
-    }
-
-
-}
diff --git a/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java b/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java
deleted file mode 100644
index 1228d4e..0000000
--- a/FightSystem_12/src/de/steamwar/fightsystem/fight/Fight_12.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import de.steamwar.fightsystem.IFightSystem;
-import org.bukkit.entity.Player;
-
-public class Fight_12 {
-
-    private Fight_12() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        target.hidePlayer(IFightSystem.getPlugin(), toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        target.showPlayer(IFightSystem.getPlugin(), toShow);
-    }
-
-
-}
diff --git a/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java b/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java
deleted file mode 100644
index 48e3c57..0000000
--- a/FightSystem_14/src/de/steamwar/fightsystem/fight/Fight_14.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import org.bukkit.entity.Player;
-
-public class Fight_14 {
-
-    private Fight_14() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        Fight_12.hidePlayer(target, toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        Fight_12.showPlayer(target, toShow);
-    }
-
-
-}
diff --git a/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java b/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java
deleted file mode 100644
index 486e873..0000000
--- a/FightSystem_15/src/de/steamwar/fightsystem/fight/Fight_15.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import org.bukkit.entity.Player;
-
-public class Fight_15 {
-
-    private Fight_15() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        Fight_14.hidePlayer(target, toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        Fight_14.showPlayer(target, toShow);
-    }
-
-
-}
diff --git a/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java b/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java
deleted file mode 100644
index e006501..0000000
--- a/FightSystem_8/src/de/steamwar/fightsystem/fight/Fight_8.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import org.bukkit.entity.Player;
-
-public class Fight_8 {
-
-    private Fight_8() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        target.hidePlayer(toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        target.showPlayer(toShow);
-    }
-
-
-}
diff --git a/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java b/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java
deleted file mode 100644
index 51dda59..0000000
--- a/FightSystem_9/src/de/steamwar/fightsystem/fight/Fight_9.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.steamwar.fightsystem.fight;
-
-import org.bukkit.entity.Player;
-
-public class Fight_9 {
-
-    private Fight_9() {}
-
-    static void hidePlayer(Player target, Player toHide) {
-        Fight_8.hidePlayer(target, toHide);
-    }
-
-    static void showPlayer(Player target, Player toShow) {
-        Fight_8.showPlayer(target, toShow);
-    }
-
-
-}
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
index 488405c..0f9bc15 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
@@ -93,32 +93,8 @@ public class Fight {
         if(gameMode == GameMode.SPECTATOR) {
             for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) {
                 if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) {
-                    switch (Core.getVersion()) {
-                        case 8:
-                            Fight_8.hidePlayer(currentPlayer, player);
-                            Fight_8.hidePlayer(player, currentPlayer);
-                            break;
-                        case 9:
-                            Fight_9.hidePlayer(currentPlayer, player);
-                            Fight_9.hidePlayer(player, currentPlayer);
-                            break;
-                        case 10:
-                            Fight_10.hidePlayer(currentPlayer, player);
-                            Fight_10.hidePlayer(player, currentPlayer);
-                            break;
-                        case 14:
-                            Fight_14.hidePlayer(currentPlayer, player);
-                            Fight_14.hidePlayer(player, currentPlayer);
-                            break;
-                        case 15:
-                            Fight_15.hidePlayer(currentPlayer, player);
-                            Fight_15.hidePlayer(player, currentPlayer);
-                            break;
-                        default:
-                            Fight_12.hidePlayer(currentPlayer, player);
-                            Fight_12.hidePlayer(player, currentPlayer);
-                            break;
-                    }
+                    currentPlayer.hidePlayer(player);
+                    player.hidePlayer(currentPlayer);
                 }
             }
         }
@@ -126,32 +102,8 @@ public class Fight {
         if(gameMode == GameMode.SURVIVAL) {
             for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) {
                 if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) {
-                    switch (Core.getVersion()) {
-                        case 8:
-                            Fight_8.showPlayer(currentPlayer, player);
-                            Fight_8.showPlayer(player, currentPlayer);
-                            break;
-                        case 9:
-                            Fight_9.showPlayer(currentPlayer, player);
-                            Fight_9.showPlayer(player, currentPlayer);
-                            break;
-                        case 10:
-                            Fight_10.showPlayer(currentPlayer, player);
-                            Fight_10.showPlayer(player, currentPlayer);
-                            break;
-                        case 14:
-                            Fight_14.showPlayer(currentPlayer, player);
-                            Fight_14.showPlayer(player, currentPlayer);
-                            break;
-                        case 15:
-                            Fight_15.showPlayer(currentPlayer, player);
-                            Fight_15.showPlayer(player, currentPlayer);
-                            break;
-                        default:
-                            Fight_12.showPlayer(currentPlayer, player);
-                            Fight_12.showPlayer(player, currentPlayer);
-                            break;
-                    }
+                    currentPlayer.showPlayer(player);
+                    player.showPlayer(currentPlayer);
                 }
             }
         }