diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java
index 991b2115d..93f978bf9 100644
--- a/src/main/java/kamkeel/npcs/network/PacketHandler.java
+++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java
@@ -569,7 +569,7 @@ public class PacketHandler {
         DATA_PACKET.registerPacket(new DialogPacket());
         DATA_PACKET.registerPacket(new RolePacket());
         DATA_PACKET.registerPacket(new WeaponNpcPacket());
-        DATA_PACKET.registerPacket(new RequestProperSpawnData());
+        // DATA_PACKET.registerPacket(new RequestProperSpawnData());
 
         // Data | Script Packets
         DATA_PACKET.registerPacket(new ScriptedParticlePacket());
diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java
index dbe6e691d..3e2742c37 100644
--- a/src/main/java/noppes/npcs/client/ClientTickHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java
@@ -7,11 +7,9 @@ import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.relauncher.Side;
 import kamkeel.npcs.client.renderer.lightning.LightningBolt;
-import kamkeel.npcs.controllers.AbilityController;
 import kamkeel.npcs.controllers.data.energycharge.EnergyChargePreviewManager;
 import kamkeel.npcs.controllers.data.telegraph.TelegraphManager;
 import kamkeel.npcs.network.PacketClient;
-import kamkeel.npcs.network.packets.data.RequestProperSpawnData;
 import kamkeel.npcs.network.packets.player.CheckPlayerValue;
 import kamkeel.npcs.network.packets.player.InputDevicePacket;
 import kamkeel.npcs.network.packets.player.ScreenSizePacket;
@@ -63,7 +61,7 @@ public class ClientTickHandler {
             if (mc.theWorld == null) {
                 ClientCacheHandler.clearCache();
                 ClientAbilityState.reset();
-                RequestProperSpawnData.clear();
+                // RequestProperSpawnData.clear();
                 if (EnergyChargePreviewManager.ClientInstance != null) {
                     EnergyChargePreviewManager.ClientInstance.clear();
                 }
@@ -218,8 +216,8 @@ public class ClientTickHandler {
             return;
 
         if (mc.theWorld.getTotalWorldTime() % 20 == 0) { // Update every second
-            if (RequestProperSpawnData.canDoBatchUpdate())
-                RequestProperSpawnData.handleBacklog();
+//            if (RequestProperSpawnData.canDoBatchUpdate())
+//                RequestProperSpawnData.handleBacklog();
             updateCompassMarks();
         }
     }
diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index d6ae75a6f..a1daf1eb6 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1837,18 +1837,18 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
         try {
             readSpawnData(ByteBufUtils.readNBT(buf));
         } catch (IOException e) {
-            if(this.worldObj != null && this.worldObj.isRemote){
-                RequestProperSpawnData.reportMissingData(this);
-            }
+//            if(this.worldObj != null && this.worldObj.isRemote){
+//                RequestProperSpawnData.reportMissingData(this);
+//            }
         }
     }
 
     public void readSpawnData(NBTTagCompound compound) {
-        if (this.worldObj != null && this.worldObj.isRemote &&
-            (compound.hasNoTags() || !compound.hasKey("MaxHealth", Constants.NBT.TAG_DOUBLE))) {
-            RequestProperSpawnData.reportMissingData(this);
-            return;
-        }
+//        if (this.worldObj != null && this.worldObj.isRemote &&
+//            (compound.hasNoTags() || !compound.hasKey("MaxHealth", Constants.NBT.TAG_DOUBLE))) {
+//            RequestProperSpawnData.reportMissingData(this);
+//            return;
+//        }
 
         immediateSpawnDataFixAttempts = 0;
         stats.maxHealth = compound.getDouble("MaxHealth");