diff --git a/src/main/java/info/sigterm/deob/ConstantPool.java b/src/main/java/info/sigterm/deob/ConstantPool.java
index b4ea412b84..abc61ac1c3 100644
--- a/src/main/java/info/sigterm/deob/ConstantPool.java
+++ b/src/main/java/info/sigterm/deob/ConstantPool.java
@@ -10,7 +10,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
-import java.security.KeyStore.Entry;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/info/sigterm/deob/Deob.java b/src/main/java/info/sigterm/deob/Deob.java
index 8c0c19ce51..fd46540e30 100644
--- a/src/main/java/info/sigterm/deob/Deob.java
+++ b/src/main/java/info/sigterm/deob/Deob.java
@@ -2,15 +2,10 @@ package info.sigterm.deob;
 
 import info.sigterm.deob.execution.Execution;
 import info.sigterm.deob.execution.Frame;
-import info.sigterm.deob.execution.Type;
-import info.sigterm.deob.execution.VariableContext;
 import info.sigterm.deob.pool.NameAndType;
 import info.sigterm.deob.attributes.Code;
 import info.sigterm.deob.attributes.code.Block;
-import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.Instructions;
-import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction;
-
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/info/sigterm/deob/attributes/Attributes.java b/src/main/java/info/sigterm/deob/attributes/Attributes.java
index d0ea8b72b2..00de68452a 100644
--- a/src/main/java/info/sigterm/deob/attributes/Attributes.java
+++ b/src/main/java/info/sigterm/deob/attributes/Attributes.java
@@ -3,8 +3,6 @@ package info.sigterm.deob.attributes;
 import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.Field;
 import info.sigterm.deob.Method;
-import info.sigterm.deob.pool.UTF8;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java b/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java
index 5057c90dfa..e3ba6bb0d1 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java
@@ -6,7 +6,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 public class Exceptions
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java
index e05eeb1791..d18f7853b0 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java
@@ -6,8 +6,6 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.InstructionContext;
 import info.sigterm.deob.execution.Stack;
-import info.sigterm.deob.execution.StackContext;
-
 import java.io.IOException;
 
 public class AThrow extends Instruction
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java
index 7251e4b8cf..da692d7d58 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java
@@ -1,7 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java
index f4dce9108b..1c8562ed71 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java
@@ -1,7 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
@@ -11,8 +9,6 @@ import info.sigterm.deob.execution.Stack;
 import info.sigterm.deob.execution.StackContext;
 import info.sigterm.deob.execution.Type;
 import info.sigterm.deob.pool.Field;
-import info.sigterm.deob.pool.NameAndType;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java
index 0227d33a3c..6cc3feb7a6 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java
@@ -1,7 +1,6 @@
 package info.sigterm.deob.attributes.code.instructions;
 
 import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java
index fd33e17625..c2321b7c28 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java
@@ -1,7 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java
index dc6a339d45..e8e703e166 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java
@@ -1,8 +1,6 @@
 package info.sigterm.deob.attributes.code.instructions;
 
 import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
-import info.sigterm.deob.Method;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java
index 4439b70ec6..d9f7a371f8 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java
@@ -1,7 +1,6 @@
 package info.sigterm.deob.attributes.code.instructions;
 
 import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java
index f6d1d8341c..26fad339c7 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java
@@ -1,7 +1,6 @@
 package info.sigterm.deob.attributes.code.instructions;
 
 import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java
index 431a9e8e93..b5a0f16e83 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java
@@ -1,8 +1,6 @@
 package info.sigterm.deob.attributes.code.instructions;
 
 import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ClassGroup;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java
index 49e2fede45..4a9b4a425b 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java
@@ -1,6 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java
index 70f36c22a1..d13ccd2d9f 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java
@@ -1,6 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java
index a4d2e3cd6d..5e3cda458a 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java
@@ -1,6 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java
index 250baccee0..6bafb2d9dd 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java
@@ -7,7 +7,6 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.InstructionContext;
 import info.sigterm.deob.execution.Stack;
 import info.sigterm.deob.execution.StackContext;
-import info.sigterm.deob.execution.Type;
 
 public class MonitorEnter extends Instruction
 {
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java
index e82baff1af..3f592004f6 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java
@@ -1,6 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java
index 511e385e77..7eb0a5a34a 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java
@@ -1,6 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java
index 90dae2302a..95ca83c6a2 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java
@@ -1,7 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
@@ -10,8 +8,6 @@ import info.sigterm.deob.execution.InstructionContext;
 import info.sigterm.deob.execution.Stack;
 import info.sigterm.deob.execution.StackContext;
 import info.sigterm.deob.pool.Field;
-import info.sigterm.deob.pool.NameAndType;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java
index b6a029d89b..a39d010379 100644
--- a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java
@@ -1,7 +1,5 @@
 package info.sigterm.deob.attributes.code.instructions;
 
-import info.sigterm.deob.ClassFile;
-import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
@@ -9,10 +7,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.InstructionContext;
 import info.sigterm.deob.execution.Stack;
 import info.sigterm.deob.execution.StackContext;
-import info.sigterm.deob.pool.Class;
 import info.sigterm.deob.pool.Field;
-import info.sigterm.deob.pool.NameAndType;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/info/sigterm/deob/execution/Execution.java b/src/main/java/info/sigterm/deob/execution/Execution.java
index 10392c6244..c6687b7af4 100644
--- a/src/main/java/info/sigterm/deob/execution/Execution.java
+++ b/src/main/java/info/sigterm/deob/execution/Execution.java
@@ -1,12 +1,7 @@
 package info.sigterm.deob.execution;
 
-import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.ClassGroup;
-import info.sigterm.deob.Method;
-
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 
 public class Execution
diff --git a/src/main/java/info/sigterm/deob/execution/Frame.java b/src/main/java/info/sigterm/deob/execution/Frame.java
index 172cc1ada1..9d1a21e442 100644
--- a/src/main/java/info/sigterm/deob/execution/Frame.java
+++ b/src/main/java/info/sigterm/deob/execution/Frame.java
@@ -3,11 +3,8 @@ package info.sigterm.deob.execution;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
 import info.sigterm.deob.Method;
 import info.sigterm.deob.attributes.Code;
 import info.sigterm.deob.attributes.code.Exception;
diff --git a/src/main/java/info/sigterm/deob/execution/Stack.java b/src/main/java/info/sigterm/deob/execution/Stack.java
index 4bdc1fe03e..cb9188c1bd 100644
--- a/src/main/java/info/sigterm/deob/execution/Stack.java
+++ b/src/main/java/info/sigterm/deob/execution/Stack.java
@@ -2,9 +2,6 @@ package info.sigterm.deob.execution;
 
 import java.util.Arrays;
 
-import info.sigterm.deob.attributes.code.Instruction;
-import info.sigterm.deob.pool.Method;
-
 public class Stack
 {
 	private int size;
diff --git a/src/main/java/info/sigterm/deob/pool/NameAndType.java b/src/main/java/info/sigterm/deob/pool/NameAndType.java
index 30fd68e199..5e8e88c1f8 100644
--- a/src/main/java/info/sigterm/deob/pool/NameAndType.java
+++ b/src/main/java/info/sigterm/deob/pool/NameAndType.java
@@ -8,8 +8,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class NameAndType extends PoolEntry
 {
diff --git a/src/main/java/info/sigterm/deob/pool/PoolEntry.java b/src/main/java/info/sigterm/deob/pool/PoolEntry.java
index 592d3ec19f..a3a63f9381 100644
--- a/src/main/java/info/sigterm/deob/pool/PoolEntry.java
+++ b/src/main/java/info/sigterm/deob/pool/PoolEntry.java
@@ -28,6 +28,7 @@ public abstract class PoolEntry
 	{
 	}
 	
+	@Override
 	public abstract boolean equals(Object other);
 	
 	public abstract void write(DataOutputStream out) throws IOException;
diff --git a/src/main/java/info/sigterm/deob/signature/Signature.java b/src/main/java/info/sigterm/deob/signature/Signature.java
index 990c61aea7..34dd5bfb00 100644
--- a/src/main/java/info/sigterm/deob/signature/Signature.java
+++ b/src/main/java/info/sigterm/deob/signature/Signature.java
@@ -2,7 +2,6 @@ package info.sigterm.deob.signature;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;