diff --git a/src/main/java/net/runelite/deob/ClassFile.java b/src/main/java/net/runelite/deob/ClassFile.java
index 1ad261847d..e89016c4e8 100644
--- a/src/main/java/net/runelite/deob/ClassFile.java
+++ b/src/main/java/net/runelite/deob/ClassFile.java
@@ -231,11 +231,6 @@ public class ClassFile
 			i.children.add(this);
 		}
 	}
-
-	public void buildInstructionGraph()
-	{
-		methods.buildInstructionGraph();
-	}
 	
 	public boolean instanceOf(ClassFile other)
 	{
diff --git a/src/main/java/net/runelite/deob/ClassGroup.java b/src/main/java/net/runelite/deob/ClassGroup.java
index b9f29f0aa0..f0d5cac302 100644
--- a/src/main/java/net/runelite/deob/ClassGroup.java
+++ b/src/main/java/net/runelite/deob/ClassGroup.java
@@ -47,10 +47,4 @@ public class ClassGroup
 		for (ClassFile c : classes)
 			c.buildClassGraph();
 	}
-
-	public void buildInstructionGraph()
-	{
-		for (ClassFile c : classes)
-			c.buildInstructionGraph();
-	}
 }
diff --git a/src/main/java/net/runelite/deob/Field.java b/src/main/java/net/runelite/deob/Field.java
index 7c5dd69afe..07e883acd8 100644
--- a/src/main/java/net/runelite/deob/Field.java
+++ b/src/main/java/net/runelite/deob/Field.java
@@ -28,8 +28,6 @@ public class Field
 	private Type type;
 	private Attributes attributes;
 
-	private ArrayList<Instruction> instructions = new ArrayList<Instruction>(); // instructions which reference this field
-
 	Field(Fields fields) throws IOException
 	{
 		this.fields = fields;
@@ -97,9 +95,4 @@ public class Field
 	{
 		return attributes;
 	}
-
-	public void addReference(Instruction ins)
-	{
-		instructions.add(ins);
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/runelite/deob/Method.java b/src/main/java/net/runelite/deob/Method.java
index 710fa636c9..a51508935c 100644
--- a/src/main/java/net/runelite/deob/Method.java
+++ b/src/main/java/net/runelite/deob/Method.java
@@ -115,14 +115,6 @@ public class Method
 	{
 		return (Code) attributes.findType(AttributeType.CODE);
 	}
-
-	public void buildInstructionGraph()
-	{
-		Code code = getCode();
-
-		if (code != null)
-			code.buildInstructionGraph();
-	}
 	
 	@SuppressWarnings("unchecked")
 	public <T extends Instruction & LVTInstruction> List<T> findLVTInstructionsForVariable(int index)
diff --git a/src/main/java/net/runelite/deob/Methods.java b/src/main/java/net/runelite/deob/Methods.java
index fab0c4e7c7..4bb6dceab3 100644
--- a/src/main/java/net/runelite/deob/Methods.java
+++ b/src/main/java/net/runelite/deob/Methods.java
@@ -72,10 +72,4 @@ public class Methods
 				return m;
 		return null;
 	}
-
-	public void buildInstructionGraph()
-	{
-		for (Method m : methods)
-			m.buildInstructionGraph();
-	}
 }
diff --git a/src/main/java/net/runelite/deob/attributes/Code.java b/src/main/java/net/runelite/deob/attributes/Code.java
index 4dc11129a9..edacb393de 100644
--- a/src/main/java/net/runelite/deob/attributes/Code.java
+++ b/src/main/java/net/runelite/deob/attributes/Code.java
@@ -111,9 +111,4 @@ public class Code extends Attribute
 	{
 		this.instructions = instructions;
 	}
-
-	public void buildInstructionGraph()
-	{
-		instructions.buildInstructionGraph();
-	}
 }
diff --git a/src/main/java/net/runelite/deob/attributes/code/Instruction.java b/src/main/java/net/runelite/deob/attributes/code/Instruction.java
index 62e4dca8ac..2027330f47 100644
--- a/src/main/java/net/runelite/deob/attributes/code/Instruction.java
+++ b/src/main/java/net/runelite/deob/attributes/code/Instruction.java
@@ -202,10 +202,6 @@ public abstract class Instruction
 		to.from.add(this);
 	}
 
-	public void buildInstructionGraph()
-	{
-	}
-	
 	public abstract void execute(Frame e);
 	
 	/* does this terminate a block? */
diff --git a/src/main/java/net/runelite/deob/attributes/code/Instructions.java b/src/main/java/net/runelite/deob/attributes/code/Instructions.java
index 5c410c3a39..f0803d1b1c 100644
--- a/src/main/java/net/runelite/deob/attributes/code/Instructions.java
+++ b/src/main/java/net/runelite/deob/attributes/code/Instructions.java
@@ -210,13 +210,7 @@ public class Instructions
 			if (i instanceof JumpingInstruction)
 				((JumpingInstruction) i).buildJumpGraph();
 	}
-
-	public void buildInstructionGraph()
-	{
-		for (Instruction i : instructions)
-			i.buildInstructionGraph();
-	}
-
+	
 	public Code getCode()
 	{
 		return code;
diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java
index f2b69e97c9..eb2227b01e 100644
--- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java
+++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java
@@ -52,22 +52,6 @@ public class GetStatic extends Instruction implements GetFieldInstruction
 		frame.addInstructionContext(ins);
 	}
 
-	@Override
-	public void buildInstructionGraph()
-	{
-		Class clazz = field.getClassEntry();
-		NameAndType nat = field.getNameAndType();
-
-		ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
-		if (cf == null)
-			return;
-
-		net.runelite.deob.Field f = cf.findFieldDeep(nat);
-		assert f != null;
-
-		f.addReference(this);
-	}
-
 	@Override
 	public Field getField()
 	{
diff --git a/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java
index c91d85e9f8..bafd0add4b 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java
@@ -253,7 +253,7 @@ public class FieldMover implements Deobfuscator
 		}
 		
 		to.getCode().getInstructions().buildJumpGraph();
-		frame.getMethod().getCode().getInstructions().buildInstructionGraph();
+		frame.getMethod().getCode().getInstructions().buildJumpGraph();
 		
 		for (Instruction i : orderedIns.values())
 		{