diff --git a/CommonCore b/CommonCore
index 61ffbc2..bfc72dd 160000
--- a/CommonCore
+++ b/CommonCore
@@ -1 +1 @@
-Subproject commit 61ffbc2349bf2290b1e4f04f699d8002742fe642
+Subproject commit bfc72ddcb77199bbb8eb19bdfc50744f7234745a
diff --git a/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java b/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
index c0f3a6b..fc0a30a 100644
--- a/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
+++ b/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
@@ -38,19 +38,6 @@ import java.util.function.Function;
 
 public class RPlayer extends REntity {
 
-    /*
-    private static final String SCOREBOARD_TEAMNAME = "Replay";
-    private static final Team team;
-
-    static {
-        if(FightScoreboard.getBukkit().getTeam(SCOREBOARD_TEAMNAME) == null)
-            team = FightScoreboard.getBukkit().registerNewTeam(SCOREBOARD_TEAMNAME);
-        else
-            team = FightScoreboard.getBukkit().getTeam(SCOREBOARD_TEAMNAME);
-        team.setNameTagVisibility(NameTagVisibility.NEVER);
-    }
-    */
-
     private static int skinPartsIndex() {
         switch(Core.getVersion()) {
             case 8:
@@ -79,7 +66,6 @@ public class RPlayer extends REntity {
     public RPlayer(REntityServer server, UUID uuid, String name, Location location) {
         super(server, EntityType.PLAYER, uuid, location,0);
         this.name = name;
-        //team.addEntry(name);
         server.addEntity(this);
     }
 
@@ -98,7 +84,6 @@ public class RPlayer extends REntity {
 
     @Override
     void despawn(Consumer<Object> packetSink) {
-        //team.removeEntry(name);
         super.despawn(packetSink);
         packetSink.accept(ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(uuid, name), GameMode.CREATIVE));
     }