diff --git a/recaf-core/src/main/java/software/coley/recaf/services/mapping/WorkspaceClassRemapper.java b/recaf-core/src/main/java/software/coley/recaf/services/mapping/WorkspaceClassRemapper.java
index af2232e50..4461330ba 100644
--- a/recaf-core/src/main/java/software/coley/recaf/services/mapping/WorkspaceClassRemapper.java
+++ b/recaf-core/src/main/java/software/coley/recaf/services/mapping/WorkspaceClassRemapper.java
@@ -21,7 +21,6 @@
  */
 public class WorkspaceClassRemapper extends ClassRemapper {
 	private final WorkspaceBackedRemapper workspaceRemapper;
-	private String visitedClassName;
 
 	/**
 	 * @param cv
@@ -38,13 +37,6 @@ public WorkspaceClassRemapper(@Nullable ClassVisitor cv, @Nonnull Workspace work
 		this.workspaceRemapper = ((WorkspaceBackedRemapper) super.remapper);
 	}
 
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-		// Record the class name
-		visitedClassName = name;
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
 	@Override
 	public MethodVisitor visitMethod(int access, @Nonnull String name, @Nonnull String descriptor,
 	                                 @Nullable String signature, @Nullable String[] exceptions) {
@@ -59,7 +51,7 @@ public MethodVisitor visitMethod(int access, @Nonnull String name, @Nonnull Stri
 						remappedDescriptor,
 						remapper.mapSignature(signature, false),
 						exceptions == null ? null : remapper.mapTypes(exceptions));
-		return mv == null ? null : new VariableRenamingMethodVisitor(visitedClassName, name, descriptor, mv, workspaceRemapper);
+		return mv == null ? null : new VariableRenamingMethodVisitor(className, name, descriptor, mv, workspaceRemapper);
 	}
 
 	@Override