diff --git a/java/src/processing/mode/java/AutoFormat.java b/java/src/processing/mode/java/AutoFormat.java
index 0e0e41247..bb2e5bad1 100644
--- a/java/src/processing/mode/java/AutoFormat.java
+++ b/java/src/processing/mode/java/AutoFormat.java
@@ -864,7 +864,7 @@ public class AutoFormat implements Formatter {
    * @param result The code to format.
    * @return The formatted code.
    */
-  private String simpleRegexCleanup(String result) {
+  static private String simpleRegexCleanup(String result) {
     return result.replaceAll("([^ \n]+) +\n", "$1\n"); // Remove trail whitespace
   }
 }
diff --git a/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java b/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java
index 368fe7405..587e62947 100644
--- a/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java
+++ b/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java
@@ -299,7 +299,7 @@ public class RuntimePathBuilder {
    * @param caches The caches to invalidate so that, when their value is requested again, the value
    *    is generated again.
    */
-  private void invalidateAll(List<CachedRuntimePathFactory> caches) {
+  static private void invalidateAll(List<CachedRuntimePathFactory> caches) {
     for (CachedRuntimePathFactory cache : caches) {
       cache.invalidateCache();
     }
diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
index 294fbf6c0..57c542e44 100644
--- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -53,7 +53,6 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
   private static final String VERSION_STR = "3.0.0";
   private static final String SIZE_METHOD_NAME = "size";
   private static final String FULLSCREEN_METHOD_NAME = "fullScreen";
-  private final int tabSize;
 
   private String sketchName;
   private boolean isTesting;
@@ -100,7 +99,6 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
 
     rewriter = new TokenStreamRewriter(tokens);
     sketchName = newSketchName;
-    tabSize = newTabSize;
     destinationPackageName = newDestinationPackageName;
 
     pdeParseTreeErrorListenerMaybe = Optional.empty();
diff --git a/java/src/processing/mode/java/preproc/code/PrintWriterWithEditGen.java b/java/src/processing/mode/java/preproc/code/PrintWriterWithEditGen.java
deleted file mode 100644
index 6e855c3be..000000000
--- a/java/src/processing/mode/java/preproc/code/PrintWriterWithEditGen.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package processing.mode.java.preproc.code;
-
-import org.antlr.v4.runtime.TokenStreamRewriter;
-import processing.mode.java.preproc.PdeParseTreeListener;
-
-
-