diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
index 9b1e4a96..a6c91772 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
@@ -47,8 +47,6 @@ public class PlayerConnectionListener implements Listener {
         }
         if (user.isInWardrobe()) user.leaveWardrobe();
         Database.save(user);
-        user.despawnBackpack();
-        user.despawnBalloon();
         user.destroy();
         CosmeticUsers.removeUser(user.getUniqueId());
     }
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
index b7a379f9..d156b575 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -71,6 +71,8 @@ public class CosmeticUser {
 
     public void destroy() {
         Bukkit.getScheduler().cancelTask(taskId);
+        despawnBackpack();
+        despawnBalloon();
     }
 
     public UUID getUniqueId() {
@@ -259,14 +261,11 @@ public class CosmeticUser {
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
         MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
         Player player = Bukkit.getPlayer(getUniqueId());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
 
         if (this.invisibleArmorstand != null) return;
 
         this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(this, cosmeticBackpackType);
 
-        //player.addPassenger(invisibleArmorstand);
-
         MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
     }
 
@@ -350,8 +349,6 @@ public class CosmeticUser {
     public void hideBackpack() {
         if (hideBackpack == true) return;
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            //CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
-            getPlayer().removePassenger(invisibleArmorstand);
             invisibleArmorstand.getEquipment().clear();
             hideBackpack = true;
         }
@@ -361,7 +358,6 @@ public class CosmeticUser {
         if (hideBackpack == false) return;
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
             CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
-            getPlayer().addPassenger(invisibleArmorstand);
             ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
             invisibleArmorstand.getEquipment().setHelmet(item);
             hideBackpack = false;
@@ -383,7 +379,6 @@ public class CosmeticUser {
             PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
         }
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            //CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
             invisibleArmorstand.getEquipment().clear();
         }
         updateCosmetic();