diff --git a/src/main/java/team/chisel/client/gui/GuiChisel.java b/src/main/java/team/chisel/client/gui/GuiChisel.java
index 12b0c061..bc7dc54f 100644
--- a/src/main/java/team/chisel/client/gui/GuiChisel.java
+++ b/src/main/java/team/chisel/client/gui/GuiChisel.java
@@ -148,23 +148,16 @@ public class GuiChisel extends GuiContainer {
             super.func_146977_a(slot);
         }
     }
+
     @Override
     protected void mouseClickMove(int x, int y, int c, long d) {
-        if (scrollBar != null) {
-            int currentScroll = scrollBar.getCurrentScroll();
-            scrollBar.click(x - guiLeft, y - guiTop);
-            if (currentScroll != scrollBar.getCurrentScroll()) {
-                menu.updateItems();
-            }
-        }
-        super.mouseClickMove(x, y, c, d );
+        scrollBar.click(x - guiLeft, y - guiTop);
+        super.mouseClickMove(x, y, c, d);
     }
 
     @Override
     protected void mouseClicked(int xCoord, int yCoord, int btn) {
-        if (scrollBar != null) {
-			scrollBar.click(xCoord - guiLeft, yCoord - guiTop);
-        }
+        scrollBar.click(xCoord - guiLeft, yCoord - guiTop);
         super.mouseClicked(xCoord, yCoord, btn);
     }
 
diff --git a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
index adab8d9f..ac67c85e 100644
--- a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
+++ b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
@@ -1,6 +1,5 @@
 package team.chisel.inventory;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.cricketcraft.chisel.api.IChiselItem;
diff --git a/src/main/java/team/chisel/network/PacketHandler.java b/src/main/java/team/chisel/network/PacketHandler.java
index 52e415ef..19e69852 100644
--- a/src/main/java/team/chisel/network/PacketHandler.java
+++ b/src/main/java/team/chisel/network/PacketHandler.java
@@ -24,4 +24,4 @@ public class PacketHandler {
 		INSTANCE.registerMessage(MessagePresentConnect.Handler.class, MessagePresentConnect.class, id++, Side.CLIENT);
 		INSTANCE.registerMessage(MessageScrollUpdate.Handler.class, MessageScrollUpdate.class, id++, Side.SERVER);
 	}
-}
\ No newline at end of file
+}