diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java
index 384decef29..50e3e553d5 100644
--- a/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java
+++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java
@@ -4,7 +4,6 @@ import net.runelite.asm.Field;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
-import net.runelite.asm.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction;
 import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction;
 import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java
index 922815b1a5..9298f1ab7b 100644
--- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java
+++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java
@@ -249,12 +249,6 @@ public class InvokeInterface extends Instruction implements InvokeInstruction
 		List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
 			otherMethods = otherIi.getMethods();
 		
-		if ((thisMethods != null) != (otherMethods != null))
-			return false;
-		
-		if (thisMethods == null || otherMethods == null)
-			return true; // we don't map these anyway
-		
 		if (thisMethods.size() != otherMethods.size())
 			return false;
 		
diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java
index d6c3a790b7..f36fe4447c 100644
--- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java
+++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java
@@ -250,12 +250,6 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction
 		List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
 			otherMethods = otherIi.getMethods();
 		
-		if ((thisMethods != null) != (otherMethods != null))
-			return false;
-		
-		if (thisMethods == null || otherMethods == null)
-			return true; // we don't map these anyway
-		
 		if (thisMethods.size() != otherMethods.size())
 			return false;
 		
diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java
index 2c7176da70..9be9d53158 100644
--- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java
+++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java
@@ -19,7 +19,6 @@ import net.runelite.asm.signature.Signature;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import net.runelite.asm.Field;
@@ -220,12 +219,6 @@ public class InvokeStatic extends Instruction implements InvokeInstruction
 		List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
 			otherMethods = otherIi.getMethods();
 		
-		if ((thisMethods != null) != (otherMethods != null))
-			return false;
-		
-		if (thisMethods == null || otherMethods == null)
-			return true; // we don't map these anyway
-		
 		if (thisMethods.size() != otherMethods.size())
 			return false;
 		
diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java
index 9b0fa38501..31a42471d3 100644
--- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java
+++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java
@@ -255,12 +255,6 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
 		List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
 			otherMethods = otherIi.getMethods();
 		
-		if ((thisMethods != null) != (otherMethods != null))
-			return false;
-		
-		if (thisMethods == null || otherMethods == null)
-			return true; // we don't map these anyway
-		
 		if (thisMethods.size() != otherMethods.size())
 			return false;
 		
diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
index 70df4f4214..0c2738856e 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
@@ -199,6 +199,9 @@ public class MappingExecutorUtil
 			assert false;
 			return false;
 		}
+
+		if (className.startsWith("java/lang/reflect/"))
+			return true;
 		
 		if (className.startsWith("java/") || className.startsWith("netscape/") || className.startsWith("javax/"))
 			return false;