diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index 73ae18de..40105e64 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -807,8 +807,7 @@ public class Mob extends AbstractIntelligenceAgent {
         // only if this building has a blueprint.
         // otherwise use the mob cache location.
 
-        if (this.building != null && building.getBlueprintUUID() != 0
-            && this.loadID != 0) {
+        if (this.building != null && building.getBlueprintUUID() != 0) {
 
             int maxSlots = 10;
 
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 065ce95b..68ef80b8 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -132,7 +132,6 @@ public class NPC extends AbstractCharacter {
 
 		this.parentZone = parent;
 
-		initializeMob();
 		clearStatic();
 
 		this.dbID = MBServerStatics.NO_DB_ROW_ASSIGNED_YET;
@@ -356,8 +355,7 @@ public class NPC extends AbstractCharacter {
 		// For some reason the npc is created and initialized twice when
 		// createMobWithNoID() is called.
 
-		if (this.building != null &&
-		    this.loadID != 0) {
+		if (this.building != null) {
 
 			// Artillery Tower Captains use a hardcoded slot not first available
 
@@ -1617,8 +1615,6 @@ public class NPC extends AbstractCharacter {
 		if (npc.building == null)
 			return -1;
 
-
-
 		BuildingModelBase buildingModel = BuildingModelBase.getModelBase(npc.building.getMeshUUID());
 
 		if (buildingModel == null)