diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java
index 40e228434..89165b92f 100644
--- a/src/main/java/noppes/npcs/NoppesUtilServer.java
+++ b/src/main/java/noppes/npcs/NoppesUtilServer.java
@@ -39,7 +39,6 @@ import noppes.npcs.roles.RoleTransporter;
 import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.ScriptSound;
 import noppes.npcs.scripted.event.DialogEvent;
-import noppes.npcs.util.CustomNPCsScheduler;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -256,20 +255,18 @@ public class NoppesUtilServer {
 		setEditingNpc(player, npc);
 		sendExtraData(player, npc,gui, i, j, k);
 
-		CustomNPCsScheduler.runTack(() -> {
-			if(CustomNpcs.proxy.getServerGuiElement(gui.ordinal(), player, player.worldObj, i, j, k) != null){
-				player.openGui(CustomNpcs.instance, gui.ordinal(), player.worldObj, i, j, k);
-				return;
-			}
-			else{
-				Server.sendDataChecked((EntityPlayerMP)player, EnumPacketClient.GUI, gui.ordinal(), i, j, k);
-			}
-			ArrayList<String> list = getScrollData(player, gui, npc);
-			if(list == null || list.isEmpty())
-				return;
+		if(CustomNpcs.proxy.getServerGuiElement(gui.ordinal(), player, player.worldObj, i, j, k) != null){
+			player.openGui(CustomNpcs.instance, gui.ordinal(), player.worldObj, i, j, k);
+			return;
+		}
+		else{
+			Server.sendDataChecked((EntityPlayerMP)player, EnumPacketClient.GUI, gui.ordinal(), i, j, k);
+		}
+		ArrayList<String> list = getScrollData(player, gui, npc);
+		if(list == null || list.isEmpty())
+			return;
 
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
-		}, 100);
+		Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
 	}
 
 	public static void sendOpenGuiNoDelay(final EntityPlayer player,
diff --git a/src/main/java/noppes/npcs/Server.java b/src/main/java/noppes/npcs/Server.java
index fe2aeee29..03cf993b4 100644
--- a/src/main/java/noppes/npcs/Server.java
+++ b/src/main/java/noppes/npcs/Server.java
@@ -22,7 +22,7 @@ import java.util.Map;
 public class Server {
 
 	public static void sendData(final EntityPlayerMP player, final EnumPacketClient enu, final Object... obs) {
-		sendDataDelayed(player, enu, 0, obs);
+		sendDataChecked(player, enu, obs);
 	}
 
 	public static void sendDataDelayed(final EntityPlayerMP player, final EnumPacketClient type, int delay, final Object... obs) {
diff --git a/src/main/java/noppes/npcs/client/Client.java b/src/main/java/noppes/npcs/client/Client.java
index 6c101dea5..3dc7dc7d3 100644
--- a/src/main/java/noppes/npcs/client/Client.java
+++ b/src/main/java/noppes/npcs/client/Client.java
@@ -27,16 +27,14 @@ public class Client {
 	private static HashMap<String, ImageData> imageDataCache = new HashMap<>();
 
 	public static void sendData(final EnumPacketServer enu, final Object... obs) {
-		CustomNPCsScheduler.runTack(() -> {
-			ByteBuf buffer = Unpooled.buffer();
-			try {
-				if(!Server.fillBuffer(buffer, enu, obs))
-					return;
-				CustomNpcs.Channel.sendToServer(new FMLProxyPacket(buffer, "CustomNPCs"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		});
+		ByteBuf buffer = Unpooled.buffer();
+		try {
+			if(!Server.fillBuffer(buffer, enu, obs))
+				return;
+			CustomNpcs.Channel.sendToServer(new FMLProxyPacket(buffer, "CustomNPCs"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 
 	public static ImageData getImageData(String directory) {
diff --git a/src/main/java/noppes/npcs/items/ItemNpcWand.java b/src/main/java/noppes/npcs/items/ItemNpcWand.java
index 888f30e4e..2c703e9f5 100644
--- a/src/main/java/noppes/npcs/items/ItemNpcWand.java
+++ b/src/main/java/noppes/npcs/items/ItemNpcWand.java
@@ -18,7 +18,6 @@ import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.config.ConfigMain;
 import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.entity.EntityCustomNpc;
-import noppes.npcs.util.CustomNPCsScheduler;
 
 public class ItemNpcWand extends Item{
 	
diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java
index 815d27e00..0c8174d78 100644
--- a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java
+++ b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java
@@ -5,8 +5,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import noppes.npcs.CustomItems;
 import noppes.npcs.client.gui.player.GuiFaction;
-import noppes.npcs.client.gui.player.GuiQuestLog;
-import noppes.npcs.util.CustomNPCsScheduler;
 
 public class InventoryTabFactions extends AbstractTab {
 	public InventoryTabFactions() {
diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java
index c3cb49dcb..bca535a5c 100644
--- a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java
+++ b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java
@@ -3,11 +3,8 @@ package tconstruct.client.tabs;
 import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.play.client.C0DPacketCloseWindow;
 import noppes.npcs.CustomItems;
-import noppes.npcs.client.gui.player.GuiFaction;
 import noppes.npcs.client.gui.player.GuiQuestLog;
-import noppes.npcs.util.CustomNPCsScheduler;
 
 public class InventoryTabQuests extends AbstractTab {
 	public InventoryTabQuests() {