diff --git a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
index 798ab82dd..230c5b2cd 100644
--- a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
+++ b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
@@ -10,6 +10,8 @@
 
 package ellpeck.actuallyadditions.event;
 
+import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
+import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.Util;
 import net.minecraftforge.common.MinecraftForge;
@@ -30,4 +32,13 @@ public class InitEvents{
         MinecraftForge.TERRAIN_GEN_BUS.register(new WorldDecorationEvent());
     }
 
+    public static void initClient(){
+        Util.registerEvent(new TooltipEvent());
+        Util.registerEvent(new RenderPlayerEventAA());
+
+        if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){
+            Util.registerEvent(new UpdateCheckerClientNotifier());
+        }
+    }
+
 }
diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
index cbcf23a35..822711d21 100644
--- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
+++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
@@ -19,16 +19,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.VillagerRegistry;
 import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.blocks.render.*;
-import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.event.RenderPlayerEventAA;
-import ellpeck.actuallyadditions.event.TooltipEvent;
+import ellpeck.actuallyadditions.event.InitEvents;
 import ellpeck.actuallyadditions.tile.*;
-import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier;
 import ellpeck.actuallyadditions.util.AssetUtil;
 import ellpeck.actuallyadditions.util.KeyBinds;
 import ellpeck.actuallyadditions.util.ModUtil;
-import ellpeck.actuallyadditions.util.Util;
 import ellpeck.actuallyadditions.util.playerdata.PersistantClientData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
@@ -53,9 +49,7 @@ public class ClientProxy implements IProxy{
     public void init(FMLInitializationEvent event){
         ModUtil.LOGGER.info("Initializing ClientProxy...");
 
-        if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){
-            Util.registerEvent(new UpdateCheckerClientNotifier());
-        }
+        InitEvents.initClient();
 
         AssetUtil.COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
         AssetUtil.FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
@@ -84,9 +78,6 @@ public class ClientProxy implements IProxy{
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockSmileyCloud), new RenderItems(new ModelSmileyCloud()));
 
         VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png"));
-
-        Util.registerEvent(new TooltipEvent());
-        Util.registerEvent(new RenderPlayerEventAA());
     }
 
     @Override
diff --git a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java
index ed3404ff1..f5edc25e5 100644
--- a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java
+++ b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java
@@ -10,6 +10,7 @@
 
 package ellpeck.actuallyadditions.update;
 
+import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.Util;
 
@@ -25,8 +26,10 @@ public class UpdateChecker{
     public static final String DOWNLOAD_LINK = "http://minecraft.curseforge.com/mc-mods/228404-actually-additions/files";
 
     public void init(){
-        ModUtil.LOGGER.info("Initializing Update Checker...");
-        Util.registerEvent(this);
-        new ThreadUpdateChecker();
+        if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){
+            ModUtil.LOGGER.info("Initializing Update Checker...");
+            Util.registerEvent(this);
+            new ThreadUpdateChecker();
+        }
     }
 }
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png
deleted file mode 100644
index 00fc90d98..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovel.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovelBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovelBroken.png
deleted file mode 100644
index f4ddd785f..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemDiggersShovelBroken.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png
deleted file mode 100644
index 4aa2e2e8b..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovel.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png
deleted file mode 100644
index 34bb80c72..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFastDiggersShovelBroken.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png
deleted file mode 100644
index 4f3239167..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxe.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxeBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxeBroken.png
deleted file mode 100644
index 3b17a06f9..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemMinersPickaxeBroken.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxe.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxe.png
deleted file mode 100644
index 2145c5a7f..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxe.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png
deleted file mode 100644
index 2ed084cd9..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemSilkyMinersPickaxeBroken.png and /dev/null differ