diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
index d81f0641b..168e4976b 100644
--- a/java/src/processing/mode/java/JavaBuild.java
+++ b/java/src/processing/mode/java/JavaBuild.java
@@ -561,6 +561,8 @@ public class JavaBuild {
         final String arch = Platform.getNativeArch();
 
         if (Library.hasMultipleArch(platform, importedLibraries)) {
+          // removing 32-bit export for 4.0 alpha 3
+          /*
           // Don't try to export 32-bit on macOS, because it doesn't exist.
           if (platform != PConstants.MACOS) {
             // export the 32-bit version
@@ -569,11 +571,15 @@ public class JavaBuild {
               return false;
             }
           }
+          */
           // export the 64-bit version
-          folder = new File(sketch.getFolder(), "application." + platformName + "64");
+          //folder = new File(sketch.getFolder(), "application." + platformName + "64");
+          // No longer including the 64 suffix in 4.0a3 because it's all 64-bit
+          folder = new File(sketch.getFolder(), "application." + platformName);
           if (!exportApplication(folder, platform, "64", embedJava && (bits == 64) && "amd64".equals(arch))) {
             return false;
           }
+          /*
           if (platform == PConstants.LINUX) {
             // export the arm versions as well
             folder = new File(sketch.getFolder(), "application.linux-armv6hf");
@@ -585,6 +591,7 @@ public class JavaBuild {
               return false;
             }
           }
+          */
         } else { // just make a single one for this platform
           folder = new File(sketch.getFolder(), "application." + platformName);
           if (!exportApplication(folder, platform, "", embedJava)) {
diff --git a/todo.txt b/todo.txt
index db4cad2a4..4d6c57cd9 100755
--- a/todo.txt
+++ b/todo.txt
@@ -14,6 +14,7 @@ X   https://github.com/processing/processing4/issues/114
 X prevent "illegal line" message when loading library with FEFF chars in properties file
 X fix revision number in exported code
 X   https://github.com/processing/processing4/issues/135
+X turn off 32-bit and ARM exports, drop '64' from the folder name
 
 
 contribs
@@ -33,7 +34,7 @@ _   https://github.com/processing/processing/pull/6048
 
 discuss with Sam
 _ preproc needs spaces in the size command, per our guidelines
-_   https://github.com/processing/processing4/issues/135
+_   https://github.com/processing/processing4/issues/136
 _ JSSC binaries for windows_32 and windows_64 appear to be macOS files
 _   https://github.com/processing/processing4/issues/119
 _ Move PdePreprocessIssueException to the test package