diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index 62bff600..634633b9 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -156,7 +156,6 @@ public class ObjectAwareness extends Service {
 		} else {
 			if (creature)
 				startScene((CreatureObject) object, oti.getNewLocation());
-			object.createObject(owner);
 			moveFromOld(object, old);
 		}
 		new PlayerEventIntent(object.getOwner(), PlayerEvent.PE_ZONE_IN).broadcast();
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 2f36bc31..8cad296f 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -367,14 +367,6 @@ public class ObjectManager extends Manager {
 			sendClientFatal(player, "Failed to zone", "There has been an internal server error: Null Ghost.\nPlease delete your character and create a new one", 10, TimeUnit.SECONDS);
 			return;
 		}
-		if (creatureObj.getParent() != null) {
-			objectAwareness.update(creatureObj);
-			Log.d("ObjectManager", "Zoning in to %s/%s - %s", creatureObj.getParent(), creatureObj.getTerrain(), creatureObj.getLocation().getPosition());
-		}else {
-			objectAwareness.remove(creatureObj);
-			objectAwareness.add(creatureObj);
-			Log.d("ObjectManager", "Zoning in to %s - %s", creatureObj.getTerrain(), creatureObj.getLocation().getPosition());
-		}
 		new RequestZoneInIntent(player, (CreatureObject) creatureObj, galaxy).broadcast();
 	}