diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
index 1ce7e694b..cc425bbb0 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
@@ -9,7 +9,6 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
 import com.raoulvdberge.refinedstorage.api.util.IStackList;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import io.netty.buffer.ByteBuf;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
@@ -18,7 +17,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Items;
@@ -655,12 +653,4 @@ public final class RSUtils {
             .put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, getTransform(0, 0, 0, 0, 225, 0, 0.4f))
             .build();
     }
-
-    public static boolean canAddToCreativeTab(Item item, CreativeTabs tab) {
-        return tab == CreativeTabs.SEARCH || tab == item.getCreativeTab();
-    }
-
-    public static boolean canAddToCreativeTab(Block block, CreativeTabs tab) {
-        return tab == CreativeTabs.SEARCH || tab == block.getCreativeTabToDisplayOn();
-    }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
index e099fe6d5..87431ee38 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.RSBlocks;
 import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.item.ItemBlockController;
 import com.raoulvdberge.refinedstorage.tile.TileController;
 import net.minecraft.block.properties.PropertyEnum;
@@ -37,10 +36,6 @@ public class BlockController extends BlockBase {
 
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
-            return;
-        }
-
         for (int i = 0; i <= 1; i++) {
             items.add(ItemBlockController.createStackWithNBT(new ItemStack(this, 1, i)));
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
index 04a73534a..92ddac375 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.RSBlocks;
 import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidStorage;
 import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage;
 import com.raoulvdberge.refinedstorage.tile.TileFluidStorage;
@@ -38,10 +37,6 @@ public class BlockFluidStorage extends BlockNode {
 
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
-            return;
-        }
-
         for (int i = 0; i <= 4; ++i) {
             items.add(ItemBlockFluidStorage.initNBT(new ItemStack(this, 1, i)));
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
index 7b69c1508..5e5f6c8f4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
@@ -1,7 +1,6 @@
 package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
 import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
 import net.minecraft.block.properties.PropertyEnum;
@@ -32,10 +31,6 @@ public class BlockGrid extends BlockNode {
 
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
-            return;
-        }
-
         for (int i = 0; i <= 3; i++) {
             items.add(new ItemStack(this, 1, i));
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
index 54e8f4cd5..7b2eda252 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.RSBlocks;
 import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorage;
 import com.raoulvdberge.refinedstorage.item.ItemBlockStorage;
 import com.raoulvdberge.refinedstorage.tile.TileStorage;
@@ -38,10 +37,6 @@ public class BlockStorage extends BlockNode {
 
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
-            return;
-        }
-
         for (int i = 0; i <= 4; ++i) {
             items.add(ItemBlockStorage.initNBT(new ItemStack(this, 1, i)));
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java
index e43cecdd7..7eeee367d 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.block.Direction;
 import net.minecraft.block.Block;
 import net.minecraft.client.resources.I18n;
@@ -70,7 +69,7 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java
index d50599620..09851f7de 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -18,7 +17,7 @@ public class ItemCore extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java
index a2d91b11c..9411a7376 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
@@ -71,7 +70,7 @@ public abstract class ItemEnergyItem extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
index 0dee19f15..8741985f1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
@@ -1,7 +1,6 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
 import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
 import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType;
@@ -49,7 +48,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
index d37774e21..37bcb861b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -20,7 +19,7 @@ public class ItemFluidStoragePart extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java
index a3bb8e168..aa8f19361 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -23,7 +22,7 @@ public class ItemProcessor extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
index 2787ea877..95a2d7ec7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
@@ -1,7 +1,6 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
 import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
 import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType;
@@ -48,7 +47,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java
index bfd2e20e0..b9031826a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -20,7 +19,7 @@ public class ItemStoragePart extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java
index 00b5a9723..0cd36c917 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java
@@ -53,7 +53,7 @@ public class ItemUpgrade extends ItemBase {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
-        if (!RSUtils.canAddToCreativeTab(this, tab)) {
+        if (!isInCreativeTab(tab)) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
index 0c08d1f43..837af5128 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11;
 
 public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRenderer<TileStorageMonitor> {
     @Override
-    public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float colorAlpha) {
+    public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
         setLightmapDisabled(true);
 
         float disX = 0, disXText = 0;