diff --git a/client/src/main/resources/textures/npc/hacker.png b/client/src/main/resources/textures/npc/hacker.png
deleted file mode 100755
index 34beb80c..00000000
Binary files a/client/src/main/resources/textures/npc/hacker.png and /dev/null differ
diff --git a/client/src/main/resources/textures/npc/trollface.png b/client/src/main/resources/textures/npc/trollface.png
deleted file mode 100755
index dd8da121..00000000
Binary files a/client/src/main/resources/textures/npc/trollface.png and /dev/null differ
diff --git a/common/src/main/java/common/entity/npc/EntityCameraHolder.java b/common/src/main/java/common/entity/npc/EntityCameraHolder.java
index d7f8df01..93e2f886 100755
--- a/common/src/main/java/common/entity/npc/EntityCameraHolder.java
+++ b/common/src/main/java/common/entity/npc/EntityCameraHolder.java
@@ -5,8 +5,8 @@ import common.rng.Random;
 import common.world.World;
 
 public class EntityCameraHolder extends EntityNPC {
-	public EntityCameraHolder(World worldIn) {
-		super(worldIn);
+	public EntityCameraHolder(World world) {
+		super(world);
 	}
 
 	public int getBaseHealth(Random rand) {
@@ -41,8 +41,14 @@ public class EntityCameraHolder extends EntityNPC {
 
 	protected void damageEntity(DamageSource damageSrc, int damageAmount) {
 	}
-    
-    public boolean canNaturallyFly() {
-    	return true;
-    }
+
+	public boolean canNaturallyFly() {
+		return true;
+	}
+
+	public void onUpdate() {
+		super.onUpdate();
+		if(!this.isPlayer())
+			this.setDead();
+	}
 }
diff --git a/server/src/main/java/server/init/UniverseRegistry.java b/server/src/main/java/server/init/UniverseRegistry.java
index 55808784..0fbf3e61 100755
--- a/server/src/main/java/server/init/UniverseRegistry.java
+++ b/server/src/main/java/server/init/UniverseRegistry.java
@@ -31,6 +31,7 @@ import common.entity.animal.EntitySheep;
 import common.entity.animal.EntityWolf;
 import common.entity.npc.EntityArachnoid;
 import common.entity.npc.EntityBloodElf;
+import common.entity.npc.EntityCameraHolder;
 import common.entity.npc.EntityCultivator;
 import common.entity.npc.EntityElf;
 import common.entity.npc.EntityFireDemon;
@@ -737,7 +738,7 @@ public abstract class UniverseRegistry extends DimensionRegistry {
 			.addLiquid(Blocks.flowing_water.getState(), 1, 8, 255, false)
 			.addLiquid(Blocks.flowing_lava.getState(), 40, 8, 255, true);
 		for(Class<? extends Entity> clazz : EntityRegistry.getAllClasses()) {
-			if(EntityLiving.class.isAssignableFrom(clazz))
+			if(EntityLiving.class.isAssignableFrom(clazz) && clazz != EntityCameraHolder.class)
 				warp.addSpawn((Class<? extends EntityLiving>)clazz, 1, 1, 8);
 		}
 		registerSemi("warp", "Der Warp", new Semi(0x0c001f, 0x190033, 124072917, 285.0f, 3, Blocks.obsidian.getState(), Blocks.lava.getState(), 63)