diff --git a/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java
index e469622..bf070b4 100644
--- a/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java
+++ b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java
@@ -21,8 +21,8 @@ public class SWScoreboard_10 {
     }
 
     public void sendScoreboard(Player player) {
-        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1);
-        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0);
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0);
 
         sendPacket(player, removePacket);
         sendPacket(player, createpacket);
@@ -40,6 +40,11 @@ public class SWScoreboard_10 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java
index 66a8b5e..943a283 100644
--- a/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java
+++ b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java
@@ -21,8 +21,8 @@ public class SWScoreboard_12 {
     }
 
     public void sendScoreboard(Player player) {
-        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1);
-        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0);
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0);
 
         sendPacket(player, removePacket);
         sendPacket(player, createpacket);
@@ -40,6 +40,11 @@ public class SWScoreboard_12 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java
index a45b23e..e0ff69d 100644
--- a/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java
+++ b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java
@@ -21,8 +21,8 @@ public class SWScoreboard_14 {
     }
 
     public void sendScoreboard(Player player) {
-        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1);
-        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0);
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0);
 
         sendPacket(player, removePacket);
         sendPacket(player, createpacket);
@@ -40,6 +40,11 @@ public class SWScoreboard_14 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java
index b8db92d..a761db7 100644
--- a/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java
+++ b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java
@@ -40,6 +40,11 @@ public class SWScoreboard_15 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java
index f0b69ba..0e9fd71 100644
--- a/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java
+++ b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java
@@ -21,8 +21,8 @@ public class SWScoreboard_8 {
     }
 
     public void sendScoreboard(Player player) {
-        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1);
-        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0);
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0);
 
         sendPacket(player, removePacket);
         sendPacket(player, createpacket);
@@ -40,6 +40,11 @@ public class SWScoreboard_8 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java
index 71f80a5..f53ccdd 100644
--- a/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java
+++ b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java
@@ -21,8 +21,8 @@ public class SWScoreboard_9 {
     }
 
     public void sendScoreboard(Player player) {
-        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1);
-        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0);
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0);
 
         sendPacket(player, removePacket);
         sendPacket(player, createpacket);
@@ -40,6 +40,11 @@ public class SWScoreboard_9 {
         sendPacket(player, displayPacket);
     }
 
+    public void deleteScoreboard(Player player) {
+        PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1);
+        sendPacket(player, removePacket);
+    }
+
     private void sendPacket(Player p, Packet<?> packet) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet);
     }
diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
index 81b3b71..883057b 100644
--- a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
+++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
@@ -41,9 +41,34 @@ public class SWScoreboard {
         return true;
     }
 
-    public static void removeScoreboard(Player player) {
-        if(playerBoards.containsKey(player))
+    public boolean removeScoreboard(Player player) {
+        if(playerBoards.containsKey(player)) {
+            switch (Core.getVersion()) {
+                case 8:
+                    ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 9:
+                    ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 10:
+                    ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 12:
+                    ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 14:
+                    ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 15:
+                    ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                default:
+                    return false;
+            }
             playerBoards.remove(player);
+            return true;
+        }
+        return false;
     }
 
     //Scoreboard Updater