diff --git a/src/main/java/mod/chiselsandbits/client/ModConflictContext.java b/src/main/java/mod/chiselsandbits/client/ModConflictContext.java
index 931f9b21..8e5a2ca5 100644
--- a/src/main/java/mod/chiselsandbits/client/ModConflictContext.java
+++ b/src/main/java/mod/chiselsandbits/client/ModConflictContext.java
@@ -7,7 +7,6 @@
 import mod.chiselsandbits.api.KeyBindingContext;
 import mod.chiselsandbits.core.ClientSide;
 import mod.chiselsandbits.helpers.ChiselToolType;
-import mod.chiselsandbits.helpers.ModUtil;
 import mod.chiselsandbits.interfaces.IVoxelBlobItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -29,7 +28,7 @@ public boolean isActive()
 			}
 
 			final ItemStack held = ClientSide.instance.getPlayer().getHeldItemMainhand();
-			return !ModUtil.isEmpty( held ) && held.getItem() instanceof IVoxelBlobItem;
+			return held != null && held.getItem() instanceof IVoxelBlobItem;
 		}
 
 		@Override
@@ -115,7 +114,7 @@ public boolean conflicts(
 		}
 	};
 
-	private Set<Class<? extends Item>> activeItemClasses = new HashSet<Class<? extends Item>>();
+	private final Set<Class<? extends Item>> activeItemClasses = new HashSet<Class<? extends Item>>();
 
 	public void setItemActive(
 			final Item item )
@@ -128,12 +127,12 @@ public boolean isActive()
 	{
 		final ItemStack held = ClientSide.instance.getPlayer().getHeldItemMainhand();
 
-		if ( ModUtil.isEmpty( held ) )
+		if ( held == null )
 		{
 			return false;
 		}
 
-		for ( Class<? extends Item> itemClass : activeItemClasses )
+		for ( final Class<? extends Item> itemClass : activeItemClasses )
 		{
 			if ( itemClass.isInstance( held.getItem() ) )
 			{
@@ -147,7 +146,7 @@ public boolean isActive()
 
 			if ( annotation instanceof KeyBindingContext )
 			{
-				for ( String name : ( (KeyBindingContext) annotation ).value() )
+				for ( final String name : ( (KeyBindingContext) annotation ).value() )
 				{
 					if ( name.equals( getName() ) )
 					{
diff --git a/src/main/java/mod/chiselsandbits/core/api/IMCHandlerKeyBinding.java b/src/main/java/mod/chiselsandbits/core/api/IMCHandlerKeyBinding.java
index 5f6185ea..f0aebb7c 100644
--- a/src/main/java/mod/chiselsandbits/core/api/IMCHandlerKeyBinding.java
+++ b/src/main/java/mod/chiselsandbits/core/api/IMCHandlerKeyBinding.java
@@ -2,7 +2,6 @@
 
 import mod.chiselsandbits.client.ModConflictContext;
 import mod.chiselsandbits.core.Log;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
@@ -27,7 +26,7 @@ public void excuteIMC(
 				item = Item.REGISTRY.getObject( new ResourceLocation( name ) );
 
 				// try finding the item in the mod instead...
-				if ( item == null || item == Items.field_190931_a )
+				if ( item == null )
 				{
 					errorName = message.getSender() + ":" + name;
 					item = Item.REGISTRY.getObject( new ResourceLocation( message.getSender(), name ) );
@@ -44,12 +43,12 @@ else if ( message.isResourceLocationMessage() )
 				return;
 			}
 
-			if ( item == null || item == Items.field_190931_a )
+			if ( item == null )
 			{
 				throw new RuntimeException( "Unable to locate item " + errorName );
 			}
 
-			for ( ModConflictContext conflictContext : ModConflictContext.values() )
+			for ( final ModConflictContext conflictContext : ModConflictContext.values() )
 			{
 				if ( conflictContext.getName().equals( message.key ) )
 				{