Removed unused methods

39 files changed, 15 insertions, 989 deletions

diff --git a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
index a4f53e4b..942c8308 100644
--- a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
+++ b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
@@ -55,10 +55,6 @@ public class TranslatingTypeLoader implements ITypeLoader {
         m_defaultTypeLoader = new ClasspathTypeLoader();
     }
 
-    public void clearCache() {
-        m_cache.clear();
-    }
-
     @Override
     public boolean tryLoadType(String className, Buffer out) {
 
diff --git a/src/main/java/cuchaz/enigma/Util.java b/src/main/java/cuchaz/enigma/Util.java
index 1bcdb9ea..9445b2b4 100644
--- a/src/main/java/cuchaz/enigma/Util.java
+++ b/src/main/java/cuchaz/enigma/Util.java
@@ -41,27 +41,6 @@ public class Util {
         return result;
     }
 
-    public static void closeQuietly(Closeable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (IOException ex) {
-                // just ignore any further exceptions
-            }
-        }
-    }
-
-    public static void closeQuietly(JarFile jarFile) {
-        // silly library should implement Closeable...
-        if (jarFile != null) {
-            try {
-                jarFile.close();
-            } catch (IOException ex) {
-                // just ignore any further exceptions
-            }
-        }
-    }
-
     public static String readStreamToString(InputStream in) throws IOException {
         return CharStreams.toString(new InputStreamReader(in, "UTF-8"));
     }
@@ -86,14 +65,4 @@ public class Util {
             }
         }
     }
-
-    public static void writeClass(CtClass c) {
-        String name = Descriptor.toJavaName(c.getName());
-        File file = new File(name + ".class");
-        try (FileOutputStream out = new FileOutputStream(file)) {
-            out.write(c.toBytecode());
-        } catch (IOException | CannotCompileException ex) {
-            throw new Error(ex);
-        }
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/analysis/Access.java b/src/main/java/cuchaz/enigma/analysis/Access.java
index 877327f1..ec5ac1ec 100644
--- a/src/main/java/cuchaz/enigma/analysis/Access.java
+++ b/src/main/java/cuchaz/enigma/analysis/Access.java
@@ -30,9 +30,7 @@ public enum Access {
     }
 
     public static Access get(int modifiers) {
-        if (Modifier.isPublic(modifiers)) {
-            return Public;
-        } else if (Modifier.isProtected(modifiers)) {
+        if (Modifier.isProtected(modifiers)) {
             return Protected;
         } else if (Modifier.isPrivate(modifiers)) {
             return Private;
diff --git a/src/main/java/cuchaz/enigma/analysis/BridgeMarker.java b/src/main/java/cuchaz/enigma/analysis/BridgeMarker.java
index cd185846..d6db11c0 100644
--- a/src/main/java/cuchaz/enigma/analysis/BridgeMarker.java
+++ b/src/main/java/cuchaz/enigma/analysis/BridgeMarker.java
@@ -18,7 +18,7 @@ import javassist.bytecode.AccessFlag;
 
 public class BridgeMarker {
 
-    private JarIndex m_jarIndex;
+    private final JarIndex m_jarIndex;
 
     public BridgeMarker(JarIndex jarIndex) {
         this.m_jarIndex = jarIndex;
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
index 3420cd6d..b1d1dee5 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
@@ -17,7 +17,6 @@ import java.util.List;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
 
 public class ClassImplementationsTreeNode extends DefaultMutableTreeNode {
@@ -59,20 +58,4 @@ public class ClassImplementationsTreeNode extends DefaultMutableTreeNode {
         // add them to this node
         nodes.forEach(this::add);
     }
-
-    public static ClassImplementationsTreeNode findNode(ClassImplementationsTreeNode node, MethodEntry entry) {
-        // is this the node?
-        if (node.entry.equals(entry)) {
-            return node;
-        }
-
-        // recurse
-        for (int i = 0; i < node.getChildCount(); i++) {
-            ClassImplementationsTreeNode foundNode = findNode((ClassImplementationsTreeNode) node.getChildAt(i), entry);
-            if (foundNode != null) {
-                return foundNode;
-            }
-        }
-        return null;
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
index a885c6a4..9a85f6ee 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
@@ -56,30 +56,6 @@ public class EntryRenamer {
         }
     }
 
-    public static <Key, Val> void renameMethodsInMultimap(Map<MethodEntry, MethodEntry> renames, Multimap<Key, Val> map) {
-        // for each key/value pair...
-        Set<Map.Entry<Key, Val>> entriesToAdd = Sets.newHashSet();
-        for (Map.Entry<Key, Val> entry : map.entries()) {
-            entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue())));
-        }
-        map.clear();
-        for (Map.Entry<Key, Val> entry : entriesToAdd) {
-            map.put(entry.getKey(), entry.getValue());
-        }
-    }
-
-    public static <Key, Val> void renameMethodsInMap(Map<MethodEntry, MethodEntry> renames, Map<Key, Val> map) {
-        // for each key/value pair...
-        Set<Map.Entry<Key, Val>> entriesToAdd = Sets.newHashSet();
-        for (Map.Entry<Key, Val> entry : map.entrySet()) {
-            entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue())));
-        }
-        map.clear();
-        for (Map.Entry<Key, Val> entry : entriesToAdd) {
-            map.put(entry.getKey(), entry.getValue());
-        }
-    }
-
     @SuppressWarnings("unchecked")
     public static <T> T renameMethodsInThing(Map<MethodEntry, MethodEntry> renames, T thing) {
         if (thing instanceof MethodEntry) {
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
index 377a8cb2..bd670905 100644
--- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
@@ -507,18 +507,10 @@ public class JarIndex {
         return this.fields.values();
     }
 
-    public Collection<FieldEntry> getObfFieldEntries(ClassEntry classEntry) {
-        return this.fields.get(classEntry);
-    }
-
     public Collection<BehaviorEntry> getObfBehaviorEntries() {
         return this.behaviors.values();
     }
 
-    public Collection<BehaviorEntry> getObfBehaviorEntries(ClassEntry classEntry) {
-        return this.behaviors.get(classEntry);
-    }
-
     public TranslationIndex getTranslationIndex() {
         return this.translationIndex;
     }
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
index 719930e9..3fa1309a 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
@@ -145,10 +145,6 @@ public class SourceIndex {
         return this.tokenToReference.keySet();
     }
 
-    public Iterable<Token> declarationTokens() {
-        return this.declarationToToken.values();
-    }
-
     public Iterable<Entry> declarations() {
         return this.declarationToToken.keySet();
     }
diff --git a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
index adb87b6f..3d8f5560 100644
--- a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
@@ -152,13 +152,6 @@ public class TranslationIndex implements Serializable {
         return subclasses;
     }
 
-    public void getSubclassesRecursively(Set<ClassEntry> out, ClassEntry classEntry) {
-        for (ClassEntry subclassEntry : getSubclass(classEntry)) {
-            out.add(subclassEntry);
-            getSubclassesRecursively(out, subclassEntry);
-        }
-    }
-
     public void getSubclassNamesRecursively(Set<String> out, ClassEntry classEntry) {
         for (ClassEntry subclassEntry : getSubclass(classEntry)) {
             out.add(subclassEntry.getName());
diff --git a/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java b/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java
deleted file mode 100644
index ef8a190c..00000000
--- a/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-package cuchaz.enigma.analysis;
-
-import com.strobel.componentmodel.Key;
-import com.strobel.decompiler.languages.java.ast.*;
-import com.strobel.decompiler.patterns.Pattern;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-
-public class TreeDumpVisitor implements IAstVisitor<Void, Void> {
-
-    private File m_file;
-    private Writer m_out;
-
-    public TreeDumpVisitor(File file) {
-        m_file = file;
-        m_out = null;
-    }
-
-    @Override
-    public Void visitCompilationUnit(CompilationUnit node, Void ignored) {
-        try {
-            m_out = new FileWriter(m_file);
-            recurse(node, ignored);
-            m_out.close();
-            return null;
-        } catch (IOException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    private Void recurse(AstNode node, Void ignored) {
-        // show the tree
-        try {
-            m_out.write(getIndent(node) + node.getClass().getSimpleName() + " " + getText(node) + " " + dumpUserData(node) + " " + node.getRegion() + "\n");
-        } catch (IOException ex) {
-            throw new Error(ex);
-        }
-
-        // recurse
-        for (final AstNode child : node.getChildren()) {
-            child.acceptVisitor(this, ignored);
-        }
-        return null;
-    }
-
-    private String getText(AstNode node) {
-        if (node instanceof Identifier) {
-            return "\"" + ((Identifier) node).getName() + "\"";
-        }
-        return "";
-    }
-
-    private String dumpUserData(AstNode node) {
-        StringBuilder buf = new StringBuilder();
-        for (Key<?> key : Keys.ALL_KEYS) {
-            Object val = node.getUserData(key);
-            if (val != null) {
-                buf.append(String.format(" [%s=%s]", key, val));
-            }
-        }
-        return buf.toString();
-    }
-
-    private String getIndent(AstNode node) {
-        StringBuilder buf = new StringBuilder();
-        int depth = getDepth(node);
-        for (int i = 0; i < depth; i++) {
-            buf.append("\t");
-        }
-        return buf.toString();
-    }
-
-    private int getDepth(AstNode node) {
-        int depth = -1;
-        while (node != null) {
-            depth++;
-            node = node.getParent();
-        }
-        return depth;
-    }
-
-    // OVERRIDES WE DON'T CARE ABOUT
-
-    @Override
-    public Void visitInvocationExpression(InvocationExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitMemberReferenceExpression(MemberReferenceExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitSimpleType(SimpleType node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitMethodDeclaration(MethodDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitConstructorDeclaration(ConstructorDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitParameterDeclaration(ParameterDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitFieldDeclaration(FieldDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitTypeDeclaration(TypeDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitComment(Comment node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitPatternPlaceholder(AstNode node, Pattern pattern, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitTypeReference(TypeReferenceExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitJavaTokenNode(JavaTokenNode node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitIdentifier(Identifier node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitNullReferenceExpression(NullReferenceExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitThisReferenceExpression(ThisReferenceExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitSuperReferenceExpression(SuperReferenceExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitClassOfExpression(ClassOfExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitBlockStatement(BlockStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitExpressionStatement(ExpressionStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitBreakStatement(BreakStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitContinueStatement(ContinueStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitDoWhileStatement(DoWhileStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitEmptyStatement(EmptyStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitIfElseStatement(IfElseStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitLabelStatement(LabelStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitLabeledStatement(LabeledStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitReturnStatement(ReturnStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitSwitchStatement(SwitchStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitSwitchSection(SwitchSection node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitCaseLabel(CaseLabel node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitThrowStatement(ThrowStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitCatchClause(CatchClause node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitAnnotation(Annotation node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitNewLine(NewLineNode node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitVariableDeclaration(VariableDeclarationStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitVariableInitializer(VariableInitializer node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitText(TextNode node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitImportDeclaration(ImportDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitInitializerBlock(InstanceInitializer node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitTypeParameterDeclaration(TypeParameterDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitPackageDeclaration(PackageDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitArraySpecifier(ArraySpecifier node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitComposedType(ComposedType node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitWhileStatement(WhileStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitPrimitiveExpression(PrimitiveExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitCastExpression(CastExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitBinaryOperatorExpression(BinaryOperatorExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitInstanceOfExpression(InstanceOfExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitIndexerExpression(IndexerExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitIdentifierExpression(IdentifierExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitUnaryOperatorExpression(UnaryOperatorExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitConditionalExpression(ConditionalExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitArrayInitializerExpression(ArrayInitializerExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitObjectCreationExpression(ObjectCreationExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitArrayCreationExpression(ArrayCreationExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitAssignmentExpression(AssignmentExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitForStatement(ForStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitForEachStatement(ForEachStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitTryCatchStatement(TryCatchStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitGotoStatement(GotoStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitParenthesizedExpression(ParenthesizedExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitSynchronizedStatement(SynchronizedStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitAnonymousObjectCreationExpression(AnonymousObjectCreationExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitWildcardType(WildcardType node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitMethodGroupExpression(MethodGroupExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitEnumValueDeclaration(EnumValueDeclaration node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitAssertStatement(AssertStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitLambdaExpression(LambdaExpression node, Void ignored) {
-        return recurse(node, ignored);
-    }
-
-    @Override
-    public Void visitLocalTypeDeclarationStatement(LocalTypeDeclarationStatement node, Void ignored) {
-        return recurse(node, ignored);
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/bytecode/CheckCastIterator.java b/src/main/java/cuchaz/enigma/bytecode/CheckCastIterator.java
index 19c39d3c..c47a7703 100644
--- a/src/main/java/cuchaz/enigma/bytecode/CheckCastIterator.java
+++ b/src/main/java/cuchaz/enigma/bytecode/CheckCastIterator.java
@@ -22,8 +22,8 @@ public class CheckCastIterator implements Iterator<CheckCast> {
 
     public static class CheckCast {
 
-        public String className;
-        public MethodEntry prevMethodEntry;
+        public final String className;
+        public final MethodEntry prevMethodEntry;
 
         public CheckCast(String className, MethodEntry prevMethodEntry) {
             this.className = className;
@@ -31,9 +31,9 @@ public class CheckCastIterator implements Iterator<CheckCast> {
         }
     }
 
-    private ConstPool constants;
-    private CodeAttribute attribute;
-    private CodeIterator iter;
+    private final ConstPool constants;
+    private final CodeAttribute attribute;
+    private final CodeIterator iter;
     private CheckCast next;
 
     public CheckCastIterator(CodeAttribute codeAttribute) throws BadBytecode {
@@ -110,8 +110,4 @@ public class CheckCastIterator implements Iterator<CheckCast> {
         }
         return null;
     }
-
-    public Iterable<CheckCast> casts() {
-        return () -> CheckCastIterator.this;
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
index d8e79711..944e486b 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java
@@ -90,16 +90,6 @@ public class ClassRenamer {
         });
     }
 
-    public static void moveAllClassesIntoDefaultPackage(CtClass c, final String oldPackageName) {
-        renameClasses(c, className -> {
-            ClassEntry entry = new ClassEntry(className);
-            if (entry.getPackageName().equals(oldPackageName)) {
-                return entry.getSimpleName();
-            }
-            return null;
-        });
-    }
-
     @SuppressWarnings("unchecked")
     public static void renameClasses(CtClass c, ClassNameReplacer replacer) {
 
diff --git a/src/main/java/cuchaz/enigma/bytecode/ConstPoolEditor.java b/src/main/java/cuchaz/enigma/bytecode/ConstPoolEditor.java
index 256df61e..e49ffdbd 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ConstPoolEditor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ConstPoolEditor.java
@@ -78,22 +78,6 @@ public class ConstPoolEditor {
         this.pool = pool;
     }
 
-    public void writePool(DataOutputStream out) {
-        try {
-            methodWritePool.invoke(this.pool, out);
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public static ConstPool readPool(DataInputStream in) {
-        try {
-            return constructorPool.newInstance(in);
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
     public String getMemberrefClassname(int memberrefIndex) {
         return Descriptor.toJvmName(this.pool.getClassInfo(this.pool.getMemberClass(memberrefIndex)));
     }
@@ -117,23 +101,6 @@ public class ConstPoolEditor {
             throw new Error(ex);
         }
     }
-
-    public int addItem(Object item) {
-        try {
-            return (Integer) addItem.invoke(this.pool, item);
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public int addItemForceNew(Object item) {
-        try {
-            return (Integer) addItem0.invoke(this.pool, item);
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
     @SuppressWarnings("rawtypes")
     public void removeLastItem() {
         try {
@@ -197,67 +164,4 @@ public class ConstPoolEditor {
         assert (newName.equals(getMemberrefName(memberrefIndex)));
         assert (newType.equals(getMemberrefType(memberrefIndex)));
     }
-
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    public void changeClassName(int classNameIndex, String newName) {
-        // NOTE: when changing values, we always need to copy-on-write
-        try {
-            // get the class item
-            Object item = getItem(classNameIndex).getItem();
-
-            // update the cache
-            HashMap cache = getCache();
-            if (cache != null) {
-                cache.remove(item);
-            }
-
-            // add the new name and repoint the name-and-type to it
-            new ClassInfoAccessor(item).setNameIndex(this.pool.addUtf8Info(newName));
-
-            // update the cache
-            if (cache != null) {
-                cache.put(item, item);
-            }
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public static ConstPool newConstPool() {
-        // const pool expects the name of a class to initialize itself
-        // but we want an empty pool
-        // so give it a bogus name, and then clear the entries afterwards
-        ConstPool pool = new ConstPool("a");
-
-        ConstPoolEditor editor = new ConstPoolEditor(pool);
-        int size = pool.getSize();
-        for (int i = 0; i < size - 1; i++) {
-            editor.removeLastItem();
-        }
-
-        // make sure the pool is actually empty
-        // although, in this case "empty" means one thing in it
-        // the JVM spec says index 0 should be reserved
-        assert (pool.getSize() == 1);
-        assert (editor.getItem(0) == null);
-        assert (editor.getItem(1) == null);
-        assert (editor.getItem(2) == null);
-        assert (editor.getItem(3) == null);
-
-        // also, clear the cache
-        editor.getCache().clear();
-
-        return pool;
-    }
-
-    public String dump() {
-        StringBuilder buf = new StringBuilder();
-        for (int i = 1; i < this.pool.getSize(); i++) {
-            buf.append(String.format("%4d", i));
-            buf.append("   ");
-            buf.append(getItem(i).toString());
-            buf.append("\n");
-        }
-        return buf.toString();
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/ClassInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/ClassInfoAccessor.java
index 66f22839..316bb5e4 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/ClassInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/ClassInfoAccessor.java
@@ -39,10 +39,6 @@ public class ClassInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.ClassInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
index ea775e9c..2ecda1d9 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
@@ -80,29 +80,6 @@ public class ConstInfoAccessor {
         }
     }
 
-    public ConstInfoAccessor copy() {
-        return new ConstInfoAccessor(copyItem());
-    }
-
-    public Object copyItem() {
-        // I don't know of a simpler way to copy one of these silly things...
-        try {
-            // serialize the item
-            ByteArrayOutputStream buf = new ByteArrayOutputStream();
-            DataOutputStream out = new DataOutputStream(buf);
-            write(out);
-
-            // deserialize the item
-            DataInputStream in = new DataInputStream(new ByteArrayInputStream(buf.toByteArray()));
-            Object item = new ConstInfoAccessor(in).getItem();
-            in.close();
-
-            return item;
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
     public void write(DataOutputStream out) throws IOException {
         try {
             out.writeUTF(this.item.getClass().getName());
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/InvokeDynamicInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/InvokeDynamicInfoAccessor.java
index 69aee160..a1583945 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/InvokeDynamicInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/InvokeDynamicInfoAccessor.java
@@ -57,10 +57,6 @@ public class InvokeDynamicInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.InvokeDynamicInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/MemberRefInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/MemberRefInfoAccessor.java
index 0e0297be..2835508a 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/MemberRefInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/MemberRefInfoAccessor.java
@@ -56,10 +56,6 @@ public class MemberRefInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.MemberrefInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/MethodHandleInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/MethodHandleInfoAccessor.java
index 9a7dd698..a203b43a 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/MethodHandleInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/MethodHandleInfoAccessor.java
@@ -56,10 +56,6 @@ public class MethodHandleInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.MethodHandleInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/MethodTypeInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/MethodTypeInfoAccessor.java
index 5ec9c3b4..993c79bb 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/MethodTypeInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/MethodTypeInfoAccessor.java
@@ -39,10 +39,6 @@ public class MethodTypeInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.MethodTypeInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/NameAndTypeInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/NameAndTypeInfoAccessor.java
index 95df37c1..d6c2531f 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/NameAndTypeInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/NameAndTypeInfoAccessor.java
@@ -56,10 +56,6 @@ public class NameAndTypeInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.NameAndTypeInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/StringInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/StringInfoAccessor.java
index 1c55a443..e211381b 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/StringInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/StringInfoAccessor.java
@@ -39,10 +39,6 @@ public class StringInfoAccessor {
         }
     }
 
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-
     static {
         try {
             clazz = Class.forName("javassist.bytecode.StringInfo");
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/Utf8InfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/Utf8InfoAccessor.java
deleted file mode 100644
index 7a2cb667..00000000
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/Utf8InfoAccessor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-package cuchaz.enigma.bytecode.accessors;
-
-public class Utf8InfoAccessor {
-
-    private static Class<?> clazz;
-
-    static {
-        try {
-            clazz = Class.forName("javassist.bytecode.Utf8Info");
-        } catch (Exception ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public static boolean isType(ConstInfoAccessor accessor) {
-        return clazz.isAssignableFrom(accessor.getItem().getClass());
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/convert/ClassForest.java b/src/main/java/cuchaz/enigma/convert/ClassForest.java
index b08d48fb..c9b44b33 100644
--- a/src/main/java/cuchaz/enigma/convert/ClassForest.java
+++ b/src/main/java/cuchaz/enigma/convert/ClassForest.java
@@ -28,12 +28,6 @@ public class ClassForest {
         this.forest = HashMultimap.create();
     }
 
-    public void addAll(Iterable<ClassEntry> entries) {
-        for (ClassEntry entry : entries) {
-            add(entry);
-        }
-    }
-
     public void add(ClassEntry entry) {
         try {
             this.forest.put(this.identifier.identify(entry), entry);
diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatches.java b/src/main/java/cuchaz/enigma/convert/ClassMatches.java
index 0b7e8034..851c0829 100644
--- a/src/main/java/cuchaz/enigma/convert/ClassMatches.java
+++ b/src/main/java/cuchaz/enigma/convert/ClassMatches.java
@@ -121,18 +121,10 @@ public class ClassMatches implements Iterable<ClassMatch> {
         return m_ambiguousMatchesBySource.keySet();
     }
 
-    public ClassMatch getAmbiguousMatchBySource(ClassEntry sourceClass) {
-        return m_ambiguousMatchesBySource.get(sourceClass);
-    }
-
     public ClassMatch getMatchBySource(ClassEntry sourceClass) {
         return m_matchesBySource.get(sourceClass);
     }
 
-    public ClassMatch getMatchByDest(ClassEntry destClass) {
-        return m_matchesByDest.get(destClass);
-    }
-
     public void removeSource(ClassEntry sourceClass) {
         ClassMatch match = m_matchesBySource.get(sourceClass);
         if (match != null) {
diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
index d1daadb0..7739adf2 100644
--- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
@@ -236,41 +236,6 @@ public class MappingsConverter {
         return classMatches.getUniqueMatches().containsKey(classEntry);
     }
 
-    public static void convertMappings(Mappings mappings, BiMap<ClassEntry, ClassEntry> changes) {
-
-        // sort the changes so classes are renamed in the correct order
-        // ie. if we have the mappings a->b, b->c, we have to apply b->c before a->b
-        LinkedHashMap<ClassEntry, ClassEntry> sortedChanges = Maps.newLinkedHashMap();
-        int numChangesLeft = changes.size();
-        while (!changes.isEmpty()) {
-            Iterator<Map.Entry<ClassEntry, ClassEntry>> iter = changes.entrySet().iterator();
-            while (iter.hasNext()) {
-                Map.Entry<ClassEntry, ClassEntry> change = iter.next();
-                if (changes.containsKey(change.getValue())) {
-                    sortedChanges.put(change.getKey(), change.getValue());
-                    iter.remove();
-                }
-            }
-
-            // did we remove any changes?
-            if (numChangesLeft - changes.size() > 0) {
-                // keep going
-                numChangesLeft = changes.size();
-            } else {
-                // can't sort anymore. There must be a loop
-                break;
-            }
-        }
-        if (!changes.isEmpty()) {
-            throw new Error("Unable to sort class changes! There must be a cycle.");
-        }
-
-        // convert the mappings in the correct class order
-        for (Map.Entry<ClassEntry, ClassEntry> entry : sortedChanges.entrySet()) {
-            mappings.renameObfClass(entry.getKey().getName(), entry.getValue().getName());
-        }
-    }
-
     public interface Doer<T extends Entry> {
         Collection<T> getDroppedEntries(MappingsChecker checker);
 
diff --git a/src/main/java/cuchaz/enigma/convert/MemberMatches.java b/src/main/java/cuchaz/enigma/convert/MemberMatches.java
index 32850cca..662c1db9 100644
--- a/src/main/java/cuchaz/enigma/convert/MemberMatches.java
+++ b/src/main/java/cuchaz/enigma/convert/MemberMatches.java
@@ -47,23 +47,11 @@ public class MemberMatches<T extends Entry> {
         assert (wasAdded);
     }
 
-    public void addUnmatchedSourceEntries(Iterable<T> sourceEntries) {
-        for (T sourceEntry : sourceEntries) {
-            addUnmatchedSourceEntry(sourceEntry);
-        }
-    }
-
     public void addUnmatchedDestEntry(T destEntry) {
         boolean wasAdded = m_unmatchedDestEntries.put(destEntry.getClassEntry(), destEntry);
         assert (wasAdded);
     }
 
-    public void addUnmatchedDestEntries(Iterable<T> destEntriesntries) {
-        for (T entry : destEntriesntries) {
-            addUnmatchedDestEntry(entry);
-        }
-    }
-
     public void addUnmatchableSourceEntry(T sourceEntry) {
         boolean wasAdded = m_unmatchableSourceEntries.put(sourceEntry.getClassEntry(), sourceEntry);
         assert (wasAdded);
diff --git a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java b/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
index 094b69b2..a75db366 100644
--- a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
+++ b/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
@@ -32,6 +32,6 @@ public class BrowserCaret extends DefaultCaret {
 
     @Override
     public Highlighter.HighlightPainter getSelectionPainter() {
-        return this.selectionPainter;
+        return selectionPainter;
     }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
index c89f7e33..83033bc5 100644
--- a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
@@ -33,7 +33,7 @@ public class ArgumentEntry implements Entry, Serializable {
             throw new IllegalArgumentException("Argument name cannot be null!");
         }
 
-        m_behaviorEntry = behaviorEntry;
+       m_behaviorEntry = behaviorEntry;
         m_index = index;
         m_name = name;
     }
@@ -101,9 +101,7 @@ public class ArgumentEntry implements Entry, Serializable {
     }
 
     public boolean equals(ArgumentEntry other) {
-        return m_behaviorEntry.equals(other.m_behaviorEntry)
-                && m_index == other.m_index
-                && m_name.equals(other.m_name);
+        return m_behaviorEntry.equals(other.m_behaviorEntry) && m_index == other.m_index && m_name.equals(other.m_name);
     }
 
     @Override
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index 99e463de..f831a3b8 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -117,15 +117,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return classMapping;
     }
 
-    public String getDeobfInnerClassName(String obfSimpleName) {
-        assert (isSimpleClassName(obfSimpleName));
-        ClassMapping classMapping = m_innerClassesByObfSimple.get(obfSimpleName);
-        if (classMapping != null) {
-            return classMapping.getDeobfName();
-        }
-        return null;
-    }
-
     public void setInnerClassName(ClassEntry obfInnerClass, String deobfName) {
         ClassMapping classMapping = getOrCreateInnerClass(obfInnerClass);
         if (classMapping.getDeobfName() != null) {
@@ -156,10 +147,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_fieldsByObf.values();
     }
 
-    public boolean containsObfField(String obfName, Type obfType) {
-        return m_fieldsByObf.containsKey(getFieldKey(obfName, obfType));
-    }
-
     public boolean containsDeobfField(String deobfName, Type deobfType) {
         return m_fieldsByDeobf.containsKey(getFieldKey(deobfName, deobfType));
     }
@@ -193,10 +180,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_fieldsByObf.get(getFieldKey(obfName, obfType));
     }
 
-    public FieldMapping getFieldByDeobf(String deobfName, Type obfType) {
-        return m_fieldsByDeobf.get(getFieldKey(deobfName, obfType));
-    }
-
     public String getObfFieldName(String deobfName, Type obfType) {
         FieldMapping fieldMapping = m_fieldsByDeobf.get(getFieldKey(deobfName, obfType));
         if (fieldMapping != null) {
@@ -260,10 +243,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_methodsByObf.values();
     }
 
-    public boolean containsObfMethod(String obfName, Signature obfSignature) {
-        return m_methodsByObf.containsKey(getMethodKey(obfName, obfSignature));
-    }
-
     public boolean containsDeobfMethod(String deobfName, Signature obfSignature) {
         return m_methodsByDeobf.containsKey(getMethodKey(deobfName, obfSignature));
     }
@@ -400,48 +379,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_obfFullName.compareTo(other.m_obfFullName);
     }
 
-    public boolean renameObfClass(String oldObfClassName, String newObfClassName) {
-
-        // rename inner classes
-        for (ClassMapping innerClassMapping : new ArrayList<>(m_innerClassesByObfSimple.values())) {
-            if (innerClassMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_innerClassesByObfSimple.remove(oldObfClassName) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_innerClassesByObfSimple.put(newObfClassName, innerClassMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        // rename field types
-        for (FieldMapping fieldMapping : new ArrayList<>(m_fieldsByObf.values())) {
-            String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType());
-            if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_fieldsByObf.put(getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()), fieldMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        // rename method signatures
-        for (MethodMapping methodMapping : new ArrayList<>(m_methodsByObf.values())) {
-            String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature());
-            if (methodMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_methodsByObf.remove(oldMethodKey) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_methodsByObf.put(getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature()), methodMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        if (m_obfFullName.equals(oldObfClassName)) {
-            // rename this class
-            m_obfFullName = newObfClassName;
-            return true;
-        }
-        return false;
-    }
-
     public boolean containsArgument(BehaviorEntry obfBehaviorEntry, String name) {
         MethodMapping methodMapping = m_methodsByObf.get(getMethodKey(obfBehaviorEntry.getName(), obfBehaviorEntry.getSignature()));
         return methodMapping != null && methodMapping.containsArgument(name);
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
index bd6ce4ec..0ac739c1 100644
--- a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
@@ -33,10 +33,6 @@ public class EntryFactory {
         return new ClassEntry(classMapping.getObfFullName());
     }
 
-    public static ClassEntry getDeobfClassEntry(ClassMapping classMapping) {
-        return new ClassEntry(classMapping.getDeobfName());
-    }
-
     public static ClassEntry getSuperclassEntry(CtClass c) {
         return new ClassEntry(Descriptor.toJvmName(c.getClassFile().getSuperclass()));
     }
@@ -155,8 +151,4 @@ public class EntryFactory {
     public static BehaviorEntry getObfBehaviorEntry(ClassEntry classEntry, MethodMapping methodMapping) {
         return getBehaviorEntry(classEntry, methodMapping.getObfName(), methodMapping.getObfSignature());
     }
-
-    public static BehaviorEntry getObfBehaviorEntry(ClassMapping classMapping, MethodMapping methodMapping) {
-        return getObfBehaviorEntry(getObfClassEntry(classMapping), methodMapping);
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryPair.java b/src/main/java/cuchaz/enigma/mapping/EntryPair.java
deleted file mode 100644
index 1c93d532..00000000
--- a/src/main/java/cuchaz/enigma/mapping/EntryPair.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-package cuchaz.enigma.mapping;
-
-public class EntryPair<T extends Entry> {
-
-    public T obf;
-    public T deobf;
-
-    public EntryPair(T obf, T deobf) {
-        this.obf = obf;
-        this.deobf = deobf;
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/mapping/Mappings.java b/src/main/java/cuchaz/enigma/mapping/Mappings.java
index a48ec3ff..ee4c3023 100644
--- a/src/main/java/cuchaz/enigma/mapping/Mappings.java
+++ b/src/main/java/cuchaz/enigma/mapping/Mappings.java
@@ -79,10 +79,6 @@ public class Mappings implements Serializable {
         return m_classesByObf.get(obfName);
     }
 
-    public ClassMapping getClassByDeobf(ClassEntry entry) {
-        return getClassByDeobf(entry.getName());
-    }
-
     public ClassMapping getClassByDeobf(String deobfName) {
         return m_classesByDeobf.get(deobfName);
     }
@@ -138,34 +134,6 @@ public class Mappings implements Serializable {
         return buf.toString();
     }
 
-    public void renameObfClass(String oldObfName, String newObfName) {
-        new ArrayList<>(classes()).stream().filter(classMapping -> classMapping.renameObfClass(oldObfName, newObfName)).forEach(classMapping -> {
-            boolean wasRemoved = m_classesByObf.remove(oldObfName) != null;
-            assert (wasRemoved);
-            boolean wasAdded = m_classesByObf.put(newObfName, classMapping) == null;
-            assert (wasAdded);
-        });
-    }
-
-    public Set<String> getAllObfClassNames() {
-        final Set<String> classNames = Sets.newHashSet();
-        for (ClassMapping classMapping : classes()) {
-
-            // add the class name
-            classNames.add(classMapping.getObfFullName());
-
-            // add classes from method signatures
-            for (MethodMapping methodMapping : classMapping.methods()) {
-                for (Type type : methodMapping.getObfSignature().types()) {
-                    if (type.hasClass()) {
-                        classNames.add(type.getClassEntry().getClassName());
-                    }
-                }
-            }
-        }
-        return classNames;
-    }
-
     public boolean containsDeobfClass(String deobfName) {
         return m_classesByDeobf.containsKey(deobfName);
     }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
index a23a33fa..ed36d423 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
@@ -56,7 +56,7 @@ public class MappingsReaderOld {
                     ClassMapping classMapping;
                     if (indent <= 0) {
                         // outer class
-                        classMapping = readClass(parts, false);
+                        classMapping = readClass(parts);
                         mappings.addClassMapping(classMapping);
                     } else {
 
@@ -65,7 +65,7 @@ public class MappingsReaderOld {
                             throw new MappingParseException(lineNumber, "Unexpected CLASS entry here!");
                         }
 
-                        classMapping = readClass(parts, true);
+                        classMapping = readClass(parts);
                         ((ClassMapping) mappingStack.peek()).addInnerClassMapping(classMapping);
                     }
                     mappingStack.push(classMapping);
@@ -99,7 +99,7 @@ public class MappingsReaderOld {
         return new ArgumentMapping(Integer.parseInt(parts[1]), parts[2]);
     }
 
-    private ClassMapping readClass(String[] parts, boolean makeSimple) {
+    private ClassMapping readClass(String[] parts) {
         if (parts.length == 2) {
             return new ClassMapping(parts[1]);
         } else {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
index 2b112a24..3050da6b 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -167,34 +167,6 @@ public class MappingsRenamer {
         classMapping.setArgumentName(obf.getMethodName(), obf.getMethodSignature(), obf.getIndex(), obf.getName());
     }
 
-    public boolean moveFieldToObfClass(ClassMapping classMapping, FieldMapping fieldMapping, ClassEntry obfClass) {
-        classMapping.removeFieldMapping(fieldMapping);
-        ClassMapping targetClassMapping = getOrCreateClassMapping(obfClass);
-        if (!targetClassMapping.containsObfField(fieldMapping.getObfName(), fieldMapping.getObfType())) {
-            if (!targetClassMapping.containsDeobfField(fieldMapping.getDeobfName(), fieldMapping.getObfType())) {
-                targetClassMapping.addFieldMapping(fieldMapping);
-                return true;
-            } else {
-                System.err.println("WARNING: deobf field was already there: " + obfClass + "." + fieldMapping.getDeobfName());
-            }
-        }
-        return false;
-    }
-
-    public boolean moveMethodToObfClass(ClassMapping classMapping, MethodMapping methodMapping, ClassEntry obfClass) {
-        classMapping.removeMethodMapping(methodMapping);
-        ClassMapping targetClassMapping = getOrCreateClassMapping(obfClass);
-        if (!targetClassMapping.containsObfMethod(methodMapping.getObfName(), methodMapping.getObfSignature())) {
-            if (!targetClassMapping.containsDeobfMethod(methodMapping.getDeobfName(), methodMapping.getObfSignature())) {
-                targetClassMapping.addMethodMapping(methodMapping);
-                return true;
-            } else {
-                System.err.println("WARNING: deobf method was already there: " + obfClass + "." + methodMapping.getDeobfName() + methodMapping.getObfSignature());
-            }
-        }
-        return false;
-    }
-
     public void write(OutputStream out) throws IOException {
         // TEMP: just use the object output for now. We can find a more efficient storage format later
         GZIPOutputStream gzipout = new GZIPOutputStream(out);
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
index 01a5c43d..7df4dd86 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
@@ -89,9 +89,7 @@ public class MethodEntry implements BehaviorEntry, Serializable {
     }
 
     public boolean equals(MethodEntry other) {
-        return m_classEntry.equals(other.m_classEntry)
-                && m_name.equals(other.m_name)
-                && m_signature.equals(other.m_signature);
+        return m_classEntry.equals(other.m_classEntry) && m_name.equals(other.m_name) && m_signature.equals(other.m_signature);
     }
 
     @Override
diff --git a/src/main/java/cuchaz/enigma/mapping/NameValidator.java b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
index a3b9a78a..f416322b 100644
--- a/src/main/java/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
@@ -31,17 +31,6 @@ public class NameValidator {
     static {
 
         // java allows all kinds of weird characters...
-        StringBuilder startChars = new StringBuilder();
-        StringBuilder partChars = new StringBuilder();
-        for (int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++) {
-            if (Character.isJavaIdentifierStart(i)) {
-                startChars.appendCodePoint(i);
-            }
-            if (Character.isJavaIdentifierPart(i)) {
-                partChars.appendCodePoint(i);
-            }
-        }
-
         String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*";
         IdentifierPattern = Pattern.compile(identifierRegex);
         ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));
diff --git a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
index 98643330..ec300fed 100644
--- a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
+++ b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
@@ -79,13 +79,4 @@ public class SignatureUpdater {
 
         return null;
     }
-
-    public static List<String> getClasses(String signature) {
-        final List<String> classNames = Lists.newArrayList();
-        update(signature, className -> {
-            classNames.add(className);
-            return className;
-        });
-        return classNames;
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/Translator.java b/src/main/java/cuchaz/enigma/mapping/Translator.java
index 1947d1c4..b0107ce8 100644
--- a/src/main/java/cuchaz/enigma/mapping/Translator.java
+++ b/src/main/java/cuchaz/enigma/mapping/Translator.java
@@ -38,14 +38,6 @@ public class Translator {
         m_index = index;
     }
 
-    public TranslationDirection getDirection() {
-        return m_direction;
-    }
-
-    public TranslationIndex getTranslationIndex() {
-        return m_index;
-    }
-
     @SuppressWarnings("unchecked")
     public <T extends Entry> T translateEntry(T entry) {
         if (entry instanceof ClassEntry) {
diff --git a/src/main/java/cuchaz/enigma/mapping/Type.java b/src/main/java/cuchaz/enigma/mapping/Type.java
index f2fd34d9..ec159415 100644
--- a/src/main/java/cuchaz/enigma/mapping/Type.java
+++ b/src/main/java/cuchaz/enigma/mapping/Type.java
@@ -218,8 +218,7 @@ public class Type implements Serializable {
 
     private static int countArrayDimension(String in) {
         int i = 0;
-        for (; i < in.length() && in.charAt(i) == '['; i++) {
-        }
+        for (; i < in.length() && in.charAt(i) == '['; i++) {}
         return i;
     }