diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
index d134589d6..698d3adfc 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
@@ -1,6 +1,5 @@
 package refinedstorage.gui.sidebutton;
 
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.util.text.TextFormatting;
 import refinedstorage.RefinedStorage;
 import refinedstorage.gui.GuiBase;
diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java
index 1a0a5108e..f0e65ab5e 100755
--- a/src/main/java/refinedstorage/item/ItemPattern.java
+++ b/src/main/java/refinedstorage/item/ItemPattern.java
@@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.common.util.Constants;
 
-import java.util.Collections;
 import java.util.List;
 
 public class ItemPattern extends ItemBase {
diff --git a/src/main/java/refinedstorage/network/MessageGridItems.java b/src/main/java/refinedstorage/network/MessageGridItems.java
index 5fde2d316..df68c1271 100755
--- a/src/main/java/refinedstorage/network/MessageGridItems.java
+++ b/src/main/java/refinedstorage/network/MessageGridItems.java
@@ -10,7 +10,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.container.ContainerGrid;
 import refinedstorage.storage.ClientItemGroup;
-import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.controller.TileController;
 
 import java.util.ArrayList;
diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java
index 361e98aeb..383f1817f 100755
--- a/src/main/java/refinedstorage/proxy/CommonProxy.java
+++ b/src/main/java/refinedstorage/proxy/CommonProxy.java
@@ -3,11 +3,8 @@ package refinedstorage.proxy;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
-import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -34,8 +31,6 @@ import refinedstorage.tile.controller.TileController;
 import refinedstorage.tile.grid.TileGrid;
 import refinedstorage.tile.solderer.*;
 
-import javax.annotation.Nullable;
-
 import static refinedstorage.RefinedStorage.ID;
 
 public class CommonProxy {
diff --git a/src/main/java/refinedstorage/storage/ItemGroup.java b/src/main/java/refinedstorage/storage/ItemGroup.java
index 76a8e9ab7..238e784e4 100755
--- a/src/main/java/refinedstorage/storage/ItemGroup.java
+++ b/src/main/java/refinedstorage/storage/ItemGroup.java
@@ -1,10 +1,8 @@
 package refinedstorage.storage;
 
-import io.netty.buffer.ByteBuf;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fml.common.network.ByteBufUtils;
 import refinedstorage.RefinedStorageUtils;
 
 public final class ItemGroup {
diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java
index 239caeff6..8f716a1fe 100755
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -3,7 +3,6 @@ package refinedstorage.tile;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.tile.config.IRedstoneModeConfig;
diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
index 0898c6314..1cd5e69ed 100755
--- a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
+++ b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
@@ -135,7 +135,7 @@ public class BasicCraftingTask implements ICraftingTask {
         if (!updatedOnce) {
             return "{not_started_yet}";
         }
-        
+
         StringBuilder builder = new StringBuilder();
 
         builder.append(TextFormatting.YELLOW).append("{missing_items}").append(TextFormatting.RESET).append("\n");
diff --git a/src/main/java/refinedstorage/tile/config/ICompareConfig.java b/src/main/java/refinedstorage/tile/config/ICompareConfig.java
index 88414ef61..26da4637e 100755
--- a/src/main/java/refinedstorage/tile/config/ICompareConfig.java
+++ b/src/main/java/refinedstorage/tile/config/ICompareConfig.java
@@ -1,7 +1,5 @@
 package refinedstorage.tile.config;
 
-import net.minecraft.util.math.BlockPos;
-
 public interface ICompareConfig {
     int getCompare();
 
diff --git a/src/main/java/refinedstorage/tile/config/IModeConfig.java b/src/main/java/refinedstorage/tile/config/IModeConfig.java
index 8e4b14517..cc7fa1ef0 100755
--- a/src/main/java/refinedstorage/tile/config/IModeConfig.java
+++ b/src/main/java/refinedstorage/tile/config/IModeConfig.java
@@ -1,7 +1,5 @@
 package refinedstorage.tile.config;
 
-import net.minecraft.util.math.BlockPos;
-
 public interface IModeConfig {
     void setMode(int mode);
 
diff --git a/src/main/java/refinedstorage/tile/config/IRedstoneModeConfig.java b/src/main/java/refinedstorage/tile/config/IRedstoneModeConfig.java
index 70809f5d1..21d0dcd58 100755
--- a/src/main/java/refinedstorage/tile/config/IRedstoneModeConfig.java
+++ b/src/main/java/refinedstorage/tile/config/IRedstoneModeConfig.java
@@ -1,7 +1,5 @@
 package refinedstorage.tile.config;
 
-import net.minecraft.util.math.BlockPos;
-
 public interface IRedstoneModeConfig {
     RedstoneMode getRedstoneMode();
 
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index c4fbc2da9..ff202c89a 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import refinedstorage.RefinedStorage;
diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java
index 1e78192b0..0bbc8bb62 100755
--- a/src/main/java/refinedstorage/tile/grid/IGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/IGrid.java
@@ -3,7 +3,6 @@ package refinedstorage.tile.grid;
 import net.minecraft.util.math.BlockPos;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.storage.ClientItemGroup;
-import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index d7df3d6de..a495d5510 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -25,7 +25,6 @@ import refinedstorage.network.MessageGridSettingsUpdate;
 import refinedstorage.network.MessageGridStoragePull;
 import refinedstorage.network.MessageGridStoragePush;
 import refinedstorage.storage.ClientItemGroup;
-import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.TileMachine;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index ad272dcf6..036d69026 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -14,7 +14,6 @@ import refinedstorage.network.MessageWirelessGridSettingsUpdate;
 import refinedstorage.network.MessageWirelessGridStoragePull;
 import refinedstorage.network.MessageWirelessGridStoragePush;
 import refinedstorage.storage.ClientItemGroup;
-import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 import refinedstorage.tile.controller.TileController;