diff --git a/src/main/java/com/falsepattern/endlessids/asm/AsmUtil.java b/src/main/java/com/falsepattern/endlessids/asm/AsmUtil.java
index f3c613f..2ae703c 100644
--- a/src/main/java/com/falsepattern/endlessids/asm/AsmUtil.java
+++ b/src/main/java/com/falsepattern/endlessids/asm/AsmUtil.java
@@ -21,42 +21,6 @@ public class AsmUtil
         super();
     }
     
-    public static MethodNode findMethod(final ClassNode cn, final String name) {
-        return findMethod(cn, name, false);
-    }
-    
-    public static MethodNode findMethod(final ClassNode cn, final String name, final boolean optional) {
-        for (final MethodNode ret : cn.methods) {
-            if (ret.name.equals(name)) {
-                return ret;
-            }
-        }
-        if (optional) {
-            return null;
-        }
-        throw new MethodNotFoundException(name);
-    }
-    
-    public static MethodNode findMethod(final ClassNode cn, final Name name) {
-        return findMethod(cn, name, false);
-    }
-    
-    public static MethodNode findMethod(final ClassNode cn, final Name name, final boolean optional) {
-        for (final MethodNode ret : cn.methods) {
-            if (name.matches(ret)) {
-                return ret;
-            }
-        }
-        if (optional) {
-            return null;
-        }
-        throw new MethodNotFoundException(name.deobf);
-    }
-    
-    public static FieldNode findField(final ClassNode cn, final String name) {
-        return findField(cn, name, false);
-    }
-    
     public static FieldNode findField(final ClassNode cn, final String name, final boolean optional) {
         for (final FieldNode ret : cn.fields) {
             if (name.equals(ret.name)) {
@@ -69,39 +33,11 @@ public class AsmUtil
         throw new FieldNotFoundException(name);
     }
     
-    public static FieldNode findField(final ClassNode cn, final Name name) {
-        return findField(cn, name, false);
-    }
-    
-    public static FieldNode findField(final ClassNode cn, final Name name, final boolean optional) {
-        for (final FieldNode ret : cn.fields) {
-            if (name.matches(ret)) {
-                return ret;
-            }
-        }
-        if (optional) {
-            return null;
-        }
-        throw new FieldNotFoundException(name.deobf);
-    }
-    
-    public static void makePublic(final MethodNode x) {
-        x.access = ((x.access & 0xFFFFFFF9) | 0x1);
-    }
-    
-    public static void makePublic(final FieldNode x) {
-        x.access = ((x.access & 0xFFFFFFF9) | 0x1);
-    }
-    
-    public static boolean transformInlinedSizeMethod(final ClassNode cn, final MethodNode method, final int oldValue, final int newValue) {
-        return transformInlinedSizeMethod(cn, method, oldValue, newValue, false);
-    }
-    
     public static boolean transformInlinedSizeMethod(final ClassNode cn, final MethodNode method, final int oldValue, final int newValue, final boolean optional) {
         boolean found = false;
         boolean foundOnce = false;
         final int i = 0;
-        final ListIterator<AbstractInsnNode> it = (ListIterator<AbstractInsnNode>)method.instructions.iterator();
+        final ListIterator<AbstractInsnNode> it = method.instructions.iterator();
         while (it.hasNext()) {
             final AbstractInsnNode insn = it.next();
             if (insn.getOpcode() == 3 && oldValue == 0) {
@@ -161,7 +97,7 @@ public class AsmUtil
                     it.set(new IntInsnNode(17, newValue));
                 }
                 else {
-                    it.set(new LdcInsnNode((Object)Integer.valueOf(newValue)));
+                    it.set(new LdcInsnNode(newValue));
                 }
                 found = false;
             }
@@ -172,12 +108,4 @@ public class AsmUtil
         return foundOnce;
     }
     
-    public static void dump(final InsnList list) {
-        final Textifier textifier = new Textifier();
-        final TraceMethodVisitor visitor = new TraceMethodVisitor((Printer)textifier);
-        list.accept((MethodVisitor)visitor);
-        final PrintWriter writer = new PrintWriter(System.out);
-        textifier.print(writer);
-        writer.flush();
-    }
 }
diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
index 84a5700..cc3c634 100644
--- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
+++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
@@ -6,28 +6,7 @@ import java.util.Map;
 
 public enum ClassEdit
 {
-    //SelfHooks(new SelfHooks(), new String[] { "com.falsepattern.endlessids.Hooks" }),
-    //VanillaBlockFire(new VanillaBlockFire(), new String[] { "net.minecraft.block.BlockFire" }),
-    //VanillaStatList(new VanillaStatList(), new String[] { "net.minecraft.stats.StatList" }),
-    //VanillaAnvilChunkLoader(new VanillaAnvilChunkLoader(), new String[] { "net.minecraft.world.chunk.storage.AnvilChunkLoader" }),
-    //VanillaChunk(new VanillaChunk(), new String[] { "net.minecraft.world.chunk.Chunk" }),
-    //VanillaExtendedBlockStorage(new VanillaExtendedBlockStorage(), new String[] { "net.minecraft.world.chunk.storage.ExtendedBlockStorage" }),
-    //VanillaDataWatcher(new VanillaDataWatcher(), new String[] { "net.minecraft.entity.DataWatcher" }),
-    //VanillaNetHandlerPlayClient(new VanillaNetHandlerPlayClient(), new String[] { "net.minecraft.client.network.NetHandlerPlayClient" }),
-    //VanillaS21PacketChunkData(new VanillaS21PacketChunkData(), new String[] { "net.minecraft.network.play.server.S21PacketChunkData" }),
-    //VanillaS22PacketMultiBlockChange(new VanillaS22PacketMultiBlockChange(), new String[] { "net.minecraft.network.play.server.S22PacketMultiBlockChange" }),
-    //VanillaS24PacketBlockActivation(new VanillaS24PacketBlockActivation(), new String[] { "net.minecraft.network.play.server.S24PacketBlockAction" }),
-    //VanillaS26PacketMapChunkBulk(new VanillaS26PacketMapChunkBulk(), new String[] { "net.minecraft.network.play.server.S26PacketMapChunkBulk" }),
-    //VanillaRenderGlobal(new VanillaRenderGlobal(), new String[] { "net.minecraft.client.renderer.RenderGlobal" }),
-    //VanillaPlayerControllerMP(new VanillaPlayerControllerMP(), new String[] { "net.minecraft.client.multiplayer.PlayerControllerMP" }),
-    //VanillaItemInWorldManager(new VanillaItemInWorldManager(), new String[] { "net.minecraft.server.management.ItemInWorldManager" }),
-    //VanillaWorld(new VanillaWorld(), new String[] { "net.minecraft.world.World" }),
     FmlRegistry(new FmlRegistry(), new String[] { "cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry" }),
-    //CofhBlockHelper(new CofhBlockHelper(), new String[] { "cofh.lib.util.helpers.BlockHelper" }),
-    //UndergroundBiomesOreUBifier(new UndergroundBiomesOreUBifier(), new String[] { "exterminatorJeff.undergroundBiomes.worldGen.OreUBifier" }),
-    //UndergroundBiomesBiomeUndergroundDecorator(new UndergroundBiomesBiomeUndergroundDecorator(), new String[] { "exterminatorJeff.undergroundBiomes.worldGen.BiomeUndergroundDecorator" }),
-    //MFQM(new MFQM(), new String[] { "MoreFunQuicksandMod.main.MFQM" }),
-    //WorldEditBaseBlock(new WorldEditBaseBlock(), new String[] { "com.sk89q.worldedit.blocks.BaseBlock" })
     ;
     
     private static final Map<String, ClassEdit> editMap;
diff --git a/src/main/java/com/falsepattern/endlessids/asm/Constants.java b/src/main/java/com/falsepattern/endlessids/asm/Constants.java
deleted file mode 100644
index cf75ed1..0000000
--- a/src/main/java/com/falsepattern/endlessids/asm/Constants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.falsepattern.endlessids.asm;
-
-public class Constants
-{
-
-    public static final int maxBlockId = 32767;
-    public static final int blockIdMask = 65535;
-    public static final int ebsIdArrayLength = 4096;
-    public static final int ebsIdArraySize = 8192;
-    public static final int vanillaEbsSize = 12288;
-    public static final int vanillaSize = 196864;
-    public static final int newEbsSize = 14336;
-    public static final int newSize = 229632;
-    public static final int maxDataWatcherId = 127;
-    public static final int vanillaIDCount = 4096;
-    public static final int newIDCount = 32768;
-    public static final int vanillaIDBits = 12;
-    public static final int newIDBits = 16;
-
-    public Constants() {
-        super();
-    }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/asm/IETransformer.java b/src/main/java/com/falsepattern/endlessids/asm/IETransformer.java
index 9cbeac5..f0d44b8 100644
--- a/src/main/java/com/falsepattern/endlessids/asm/IETransformer.java
+++ b/src/main/java/com/falsepattern/endlessids/asm/IETransformer.java
@@ -1,5 +1,6 @@
 package com.falsepattern.endlessids.asm;
 
+import com.falsepattern.endlessids.Tags;
 import org.apache.logging.log4j.LogManager;
 import org.objectweb.asm.util.CheckClassAdapter;
 import org.objectweb.asm.ClassWriter;
@@ -11,12 +12,9 @@ import net.minecraft.launchwrapper.IClassTransformer;
 
 public class IETransformer implements IClassTransformer
 {
-    private static final boolean enablePreVerification = false;
-    private static final boolean enablePostVerification = true;
     public static final Logger logger;
     public static boolean isObfuscated;
-    private static Boolean isClient;
-    
+
     public IETransformer() {
         super();
     }
@@ -29,44 +27,35 @@ public class IETransformer implements IClassTransformer
         if (edit == null) {
             return bytes;
         }
-        IETransformer.logger.debug("Patching {} with {}...", new Object[] { transformedName, edit.getName() });
+        IETransformer.logger.debug("Patching {} with {}...", transformedName, edit.getName());
         final ClassNode cn = new ClassNode(327680);
         final ClassReader reader = new ClassReader(bytes);
-        final int readFlags = 0;
-        reader.accept((ClassVisitor)cn, 0);
+        reader.accept(cn, 0);
         try {
             edit.getTransformer().transform(cn, IETransformer.isObfuscated);
         }
         catch (AsmTransformException t) {
-            IETransformer.logger.error("Error transforming {} with {}: {}", new Object[] { transformedName, edit.getName(), t.getMessage() });
+            IETransformer.logger.error("Error transforming {} with {}: {}", transformedName, edit.getName(), t.getMessage());
             throw t;
         }
         catch (Throwable t2) {
-            IETransformer.logger.error("Error transforming {} with {}: {}", new Object[] { transformedName, edit.getName(), t2.getMessage() });
+            IETransformer.logger.error("Error transforming {} with {}: {}", transformedName, edit.getName(), t2.getMessage());
             throw new RuntimeException(t2);
         }
         final ClassWriter writer = new ClassWriter(0);
         try {
-            final ClassVisitor check = (ClassVisitor)new CheckClassAdapter((ClassVisitor)writer);
+            final ClassVisitor check = new CheckClassAdapter(writer);
             cn.accept(check);
         }
         catch (Throwable t3) {
-            IETransformer.logger.error("Error verifying {} transformed with {}: {}", new Object[] { transformedName, edit.getName(), t3.getMessage() });
+            IETransformer.logger.error("Error verifying {} transformed with {}: {}", transformedName, edit.getName(), t3.getMessage());
             throw new RuntimeException(t3);
         }
-        IETransformer.logger.debug("Patched {} successfully.", new Object[] { edit.getName() });
+        IETransformer.logger.debug("Patched {} successfully.", edit.getName());
         return writer.toByteArray();
     }
     
-    public static boolean isClient() {
-        if (IETransformer.isClient == null) {
-            IETransformer.isClient = Boolean.valueOf(IETransformer.class.getResource("/net/minecraft/client/main/Main.class") != null);
-        }
-        return IETransformer.isClient;
-    }
-    
     static {
-        logger = LogManager.getLogger("NEID");
-        IETransformer.isClient = null;
+        logger = LogManager.getLogger(Tags.MODNAME + " ASM");
     }
 }
diff --git a/src/main/java/com/falsepattern/endlessids/asm/Name.java b/src/main/java/com/falsepattern/endlessids/asm/Name.java
deleted file mode 100644
index fc2dc6d..0000000
--- a/src/main/java/com/falsepattern/endlessids/asm/Name.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.falsepattern.endlessids.asm;
-
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.FieldNode;
-import org.objectweb.asm.tree.MethodNode;
-
-public enum Name
-{
-    hooks("com/falsepattern/endlessids/Hooks"),
-    hooks_create16BArray(Name.hooks, "create16BArray", null, null, "()[S"), 
-    hooks_getBlockData(Name.hooks, "getBlockData", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;)[B"), 
-    hooks_setBlockData(Name.hooks, "setBlockData", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;[BI)V"), 
-    hooks_writeChunkToNbt(Name.hooks, "writeChunkToNbt", null, null, "(Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;)V"), 
-    hooks_readChunkFromNbt(Name.hooks, "readChunkFromNbt", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;Lnet/minecraft/nbt/NBTTagCompound;)V"), 
-    hooks_getBlockId(Name.hooks, "getBlockId", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;III)I"), 
-    hooks_getBlockById(Name.hooks, "getBlock", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;III)Lnet/minecraft/block/Block;"), 
-    hooks_setBlockId(Name.hooks, "setBlockId", null, null, "(Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;IIII)V"), 
-    hooks_getIdFromBlockWithCheck(Name.hooks, "getIdFromBlockWithCheck", null, null, "(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)I"), 
-    acl("net/minecraft/world/chunk/storage/AnvilChunkLoader", "aqk"), 
-    block("net/minecraft/block/Block", "aji"), 
-    chunk("net/minecraft/world/chunk/Chunk", "apx"), 
-    extendedBlockStorage("net/minecraft/world/chunk/storage/ExtendedBlockStorage", "apz"), 
-    iChunkProvider("net/minecraft/world/chunk/IChunkProvider", "apu"), 
-    nbtTagCompound("net/minecraft/nbt/NBTTagCompound", "dh"), 
-    nhpc("net/minecraft/client/network/NetHandlerPlayClient", "bjb"), 
-    nibbleArray("net/minecraft/world/chunk/NibbleArray", "apv"), 
-    packet("net/minecraft/network/Packet", "ft"), 
-    packetBuffer("net/minecraft/network/PacketBuffer", "et"), 
-    s22("net/minecraft/network/play/server/S22PacketMultiBlockChange", "gk"), 
-    s21("net/minecraft/network/play/server/S21PacketChunkData", "gx"), 
-    s21_extracted("net/minecraft/network/play/server/S21PacketChunkData$Extracted", "gy"), 
-    world("net/minecraft/world/World", "ahb"), 
-    dataWatcher("net/minecraft/entity/DataWatcher", "te"), 
-    dataWatcher_watchableObject("net/minecraft/entity/DataWatcher$WatchableObject", "tf"), 
-    renderGlobal("net/minecraft/client/renderer/RenderGlobal", "bma"), 
-    playerControllerMP("net/minecraft/client/multiplayer/PlayerControllerMP", "bje"), 
-    itemInWorldManager("net/minecraft/server/management/ItemInWorldManager", "mx"), 
-    entityPlayer("net/minecraft/entity/player/EntityPlayer", "yz"), 
-    ebs_getBlock(Name.extendedBlockStorage, "getBlockByExtId", "a", "func_150819_a", "(III)Lnet/minecraft/block/Block;"), 
-    ebs_setBlock(Name.extendedBlockStorage, "func_150818_a", "a", null, "(IIILnet/minecraft/block/Block;)V"), 
-    ebs_getBlockLSBArray(Name.extendedBlockStorage, "getBlockLSBArray", "g", "func_76658_g", "()[B"), 
-    ebs_getBlockMSBArray(Name.extendedBlockStorage, "getBlockMSBArray", "i", "func_76660_i", "()Lnet/minecraft/world/chunk/NibbleArray;"), 
-    ebs_setBlockMSBArray(Name.extendedBlockStorage, "setBlockMSBArray", "a", "func_76673_a", "(Lnet/minecraft/world/chunk/NibbleArray;)V"), 
-    ebs_isEmpty(Name.extendedBlockStorage, "isEmpty", "a", "func_76663_a", "()Z"), 
-    ebs_removeInvalidBlocks(Name.extendedBlockStorage, "removeInvalidBlocks", "e", "func_76672_e", "()V"), 
-    dataWatcher_addObject(Name.dataWatcher, "addObject", "a", "func_75682_a", "(ILjava/lang/Object;)V"), 
-    dataWatcher_writeWatchableObjectToPacketBuffer(Name.dataWatcher, "writeWatchableObjectToPacketBuffer", "a", "func_151510_a", "(Lnet/minecraft/network/PacketBuffer;Lnet/minecraft/entity/DataWatcher$WatchableObject;)V"), 
-    dataWatcher_readWatchedListFromPacketBuffer(Name.dataWatcher, "readWatchedListFromPacketBuffer", "b", "func_151508_b", "(Lnet/minecraft/network/PacketBuffer;)Ljava/util/List;"), 
-    dataWatcher_writeWatchedListToPacketBuffer(Name.dataWatcher, "writeWatchedListToPacketBuffer", "a", "func_151507_a", "(Ljava/util/List;Lnet/minecraft/network/PacketBuffer;)V"), 
-    dataWatcher_func_151509_a(Name.dataWatcher, "func_151509_a", "a", "func_151509_a", "(Lnet/minecraft/network/PacketBuffer;)V"), 
-    ebs_blockRefCount(Name.extendedBlockStorage, "blockRefCount", "b", "field_76682_b", "I"), 
-    ebs_tickRefCount(Name.extendedBlockStorage, "tickRefCount", "c", "field_76683_c", "I"), 
-    acl_writeChunkToNBT(Name.acl, "writeChunkToNBT", "a", "func_75820_a", "(Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/world/World;Lnet/minecraft/nbt/NBTTagCompound;)V"), 
-    acl_readChunkFromNBT(Name.acl, "readChunkFromNBT", "a", "func_75823_a", "(Lnet/minecraft/world/World;Lnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/world/chunk/Chunk;"), 
-    block_getIdFromBlock(Name.block, "getIdFromBlock", "b", "func_149682_b", "(Lnet/minecraft/block/Block;)I"), 
-    chunk_fillChunk(Name.chunk, "fillChunk", "a", "func_76607_a", "([BIIZ)V"), 
-    packet_readPacketData(Name.packet, "readPacketData", "a", "func_148837_a", "(Lnet/minecraft/network/PacketBuffer;)V"), 
-    packet_writePacketData(Name.packet, "writePacketData", "b", "func_148840_b", "(Lnet/minecraft/network/PacketBuffer;)V"), 
-    nhpc_handleMultiBlockChange(Name.nhpc, "handleMultiBlockChange", "a", "func_147287_a", "(Lnet/minecraft/network/play/server/S22PacketMultiBlockChange;)V"), 
-    s22_init_server(Name.s22, "<init>", null, null, "(I[SLnet/minecraft/world/chunk/Chunk;)V"), 
-    s21_undefined1(Name.s21, "func_149275_c", "c", null, "()I"), 
-    s21_undefined2(Name.s21, "func_149269_a", "a", null, "(Lnet/minecraft/world/chunk/Chunk;ZI)Lnet/minecraft/network/play/server/S21PacketChunkData$Extracted;"), 
-    renderGlobal_playAuxSFX(Name.renderGlobal, "playAuxSFX", "a", "func_72706_a", "(Lnet/minecraft/entity/player/EntityPlayer;IIIII)V"), 
-    playerControllerMP_onPlayerDestroyBlock(Name.playerControllerMP, "onPlayerDestroyBlock", "a", "func_78751_a", "(IIII)Z"), 
-    itemInWorldManager_tryHarvestBlock(Name.itemInWorldManager, "tryHarvestBlock", "b", "func_73084_b", "(III)Z"), 
-    world_breakBlock(Name.world, "func_147480_a", "a", null, "(IIIZ)Z"), 
-    ub_bud("exterminatorJeff/undergroundBiomes/worldGen/BiomeUndergroundDecorator"), 
-    ub_bud_replaceChunkOres_world(Name.ub_bud, "replaceChunkOres", null, null, "(IILnet/minecraft/world/World;)V"), 
-    ub_bud_replaceChunkOres_iChunkProvider(Name.ub_bud, "replaceChunkOres", null, null, "(Lnet/minecraft/world/chunk/IChunkProvider;II)V"), 
-    MFQM("MoreFunQuicksandMod/main/MFQM"), 
-    MFQM_preInit(Name.MFQM, "preInit", null, null, "(Lcpw/mods/fml/common/event/FMLPreInitializationEvent;)V");
-    
-    public final Name clazz;
-    public final String deobf;
-    public final String obf;
-    public final String srg;
-    public final String desc;
-    public String obfDesc;
-    
-    Name(final String deobf) {
-        this(deobf, deobf);
-    }
-    
-    Name(final String deobf, final String obf) {
-        this.clazz = null;
-        this.deobf = deobf;
-        this.obf = obf;
-        this.srg = deobf;
-        this.desc = null;
-    }
-    
-    Name(final Name clazz, final String deobf, final String obf, final String srg, final String desc) {
-        this.clazz = clazz;
-        this.deobf = deobf;
-        this.obf = ((obf != null) ? obf : deobf);
-        this.srg = ((srg != null) ? srg : deobf);
-        this.desc = desc;
-    }
-    
-    public boolean matches(final MethodNode x) {
-        assert this.desc.startsWith("(");
-        return (this.obf.equals(x.name) && this.obfDesc.equals(x.desc)) || (this.srg.equals(x.name) && this.desc.equals(x.desc)) || (this.deobf.equals(x.name) && this.desc.equals(x.desc));
-    }
-    
-    public boolean matches(final FieldNode x) {
-        assert !this.desc.startsWith("(");
-        return (this.obf.equals(x.name) && this.obfDesc.equals(x.desc)) || (this.srg.equals(x.name) && this.desc.equals(x.desc)) || (this.deobf.equals(x.name) && this.desc.equals(x.desc));
-    }
-    
-    public boolean matches(final MethodInsnNode x, final boolean obfuscated) {
-        assert this.desc.startsWith("(");
-        if (obfuscated) {
-            return (this.clazz.obf.equals(x.owner) && this.obf.equals(x.name) && this.obfDesc.equals(x.desc)) || (this.clazz.srg.equals(x.owner) && this.srg.equals(x.name) && this.desc.equals(x.desc));
-        }
-        return this.clazz.deobf.equals(x.owner) && this.deobf.equals(x.name) && this.desc.equals(x.desc);
-    }
-    
-    public boolean matches(final FieldInsnNode x, final boolean obfuscated) {
-        assert !this.desc.startsWith("(");
-        if (obfuscated) {
-            return (this.clazz.obf.equals(x.owner) && this.obf.equals(x.name) && this.obfDesc.equals(x.desc)) || (this.clazz.srg.equals(x.owner) && this.srg.equals(x.name) && this.desc.equals(x.desc));
-        }
-        return this.clazz.deobf.equals(x.owner) && this.deobf.equals(x.name) && this.desc.equals(x.desc);
-    }
-    
-    public MethodInsnNode staticInvocation(final boolean obfuscated) {
-        assert this.desc.startsWith("(");
-        if (obfuscated) {
-            return new MethodInsnNode(184, this.clazz.srg, this.srg, this.desc, false);
-        }
-        return new MethodInsnNode(184, this.clazz.deobf, this.deobf, this.desc, false);
-    }
-    
-    public MethodInsnNode virtualInvocation(final boolean obfuscated) {
-        assert this.desc.startsWith("(");
-        if (obfuscated) {
-            return new MethodInsnNode(182, this.clazz.srg, this.srg, this.desc, false);
-        }
-        return new MethodInsnNode(182, this.clazz.deobf, this.deobf, this.desc, false);
-    }
-    
-    public FieldInsnNode staticGet(final boolean obfuscated) {
-        assert !this.desc.startsWith("(");
-        if (obfuscated) {
-            return new FieldInsnNode(178, this.clazz.srg, this.srg, this.desc);
-        }
-        return new FieldInsnNode(178, this.clazz.deobf, this.deobf, this.desc);
-    }
-    
-    public FieldInsnNode virtualGet(final boolean obfuscated) {
-        assert !this.desc.startsWith("(");
-        if (obfuscated) {
-            return new FieldInsnNode(180, this.clazz.srg, this.srg, this.desc);
-        }
-        return new FieldInsnNode(180, this.clazz.deobf, this.deobf, this.desc);
-    }
-    
-    public FieldInsnNode staticSet(final boolean obfuscated) {
-        assert !this.desc.startsWith("(");
-        if (obfuscated) {
-            return new FieldInsnNode(179, this.clazz.srg, this.srg, this.desc);
-        }
-        return new FieldInsnNode(179, this.clazz.deobf, this.deobf, this.desc);
-    }
-    
-    public FieldInsnNode virtualSet(final boolean obfuscated) {
-        assert !this.desc.startsWith("(");
-        if (obfuscated) {
-            return new FieldInsnNode(181, this.clazz.srg, this.srg, this.desc);
-        }
-        return new FieldInsnNode(181, this.clazz.deobf, this.deobf, this.desc);
-    }
-    
-    private static void translateDescs() {
-        final StringBuilder sb = new StringBuilder();
-        for (final Name name : values()) {
-            if (name.desc != null) {
-                int pos;
-                int endPos;
-                for (pos = 0, endPos = -1; (pos = name.desc.indexOf(76, pos)) != -1; pos = endPos + 1) {
-                    sb.append(name.desc, endPos + 1, pos);
-                    endPos = name.desc.indexOf(59, pos + 1);
-                    String cName = name.desc.substring(pos + 1, endPos);
-                    for (final Name name2 : values()) {
-                        if (name2.deobf.equals(cName)) {
-                            cName = name2.obf;
-                            break;
-                        }
-                    }
-                    sb.append('L');
-                    sb.append(cName);
-                    sb.append(';');
-                }
-                sb.append(name.desc, endPos + 1, name.desc.length());
-                name.obfDesc = sb.toString();
-                sb.setLength(0);
-            }
-        }
-    }
-    
-    static {
-        translateDescs();
-    }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java
index 847040b..0b85fa7 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java
@@ -1,6 +1,5 @@
 package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking;
 
-import com.falsepattern.endlessids.asm.Constants;
 import com.falsepattern.endlessids.constants.ExtendedConstants;
 import com.falsepattern.endlessids.constants.VanillaConstants;
 import net.minecraft.client.multiplayer.PlayerControllerMP;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java
index ecd2468..89ffac6 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java
@@ -1,7 +1,6 @@
 package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking;
 
 import com.falsepattern.endlessids.Hooks;
-import com.falsepattern.endlessids.asm.Constants;
 import com.falsepattern.endlessids.constants.ExtendedConstants;
 import com.falsepattern.endlessids.constants.VanillaConstants;
 import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin;
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java
index 326ebb8..dc4ea30 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java
@@ -1,6 +1,5 @@
 package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking;
 
-import com.falsepattern.endlessids.asm.Constants;
 import com.falsepattern.endlessids.constants.ExtendedConstants;
 import com.falsepattern.endlessids.constants.VanillaConstants;
 import net.minecraft.network.play.server.S24PacketBlockAction;