diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index 23a6bca5..8c68aa76 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -1089,7 +1089,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 			hostRank = _gameHostManager.getHostRank();
 		}
 
-		event.setMotd(C.cGoldB + "Private Test Server " + C.cGray + "IDRK ¯|_(ツ)_|¯  " + C.cDGreenB + "ONLINE" + "\n" + C.cDRedB + "|| WTF IS A NAUTILUS ||");
+		event.setMotd(C.cGoldB + "Private SMP Server " + C.cGray + "IDRK ¯|_(ツ)_|¯  " + C.cDGreenB + "ONLINE" + "\n" + C.cDRedB + "|| Execute Order 66 ||");
 	}
 
 	@EventHandler
diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java
index 022a7790..e1e8e58d 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java
@@ -55,6 +55,10 @@ public class KitHumanKnight extends KitCastleSiege
 		player.getInventory().setArmorContents(ARMOR);
 
 		DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
-		Manager.GetDisguise().undisguise(disguise);
+		while (disguise != null)
+		{
+			Manager.GetDisguise().undisguise(disguise);
+			disguise = Manager.GetDisguise().getActiveDisguise(player);
+		}
 	}
 }
diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java
index e481a155..94118003 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java
@@ -50,7 +50,11 @@ public class KitHumanMarksman extends KitCastleSiege
 		player.getInventory().addItem(PLAYER_ITEMS[3], PLAYER_ITEMS[3]);
 
 		DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
-		Manager.GetDisguise().undisguise(disguise);
+		while (disguise != null)
+		{
+			Manager.GetDisguise().undisguise(disguise);
+			disguise = Manager.GetDisguise().getActiveDisguise(player);
+		}
 
 	}
 }
diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java
index 06cb2272..a987c024 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java
@@ -58,6 +58,10 @@ public class KitHumanPaladin extends KitCastleSiege
 		player.getInventory().setArmorContents(ARMOR);
 
 		DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
-		Manager.GetDisguise().undisguise(disguise);
+		while (disguise != null)
+		{
+			Manager.GetDisguise().undisguise(disguise);
+			disguise = Manager.GetDisguise().getActiveDisguise(player);
+		}
 	}
 }
diff --git a/out/artifacts/nautilus_game_arcade_jar/Arcade.jar b/out/artifacts/nautilus_game_arcade_jar/Arcade.jar
deleted file mode 100644
index 77c5eaf6..00000000
Binary files a/out/artifacts/nautilus_game_arcade_jar/Arcade.jar and /dev/null differ