diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/AppBundlerTask.class b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/AppBundlerTask.class
deleted file mode 100644
index aeeb36b75..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/AppBundlerTask.class and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Architecture.class b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Architecture.class
deleted file mode 100644
index d6f39ccd3..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Architecture.class and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Argument.class b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Argument.class
deleted file mode 100644
index 586b79c34..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Argument.class and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/BundleDocument.class b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/BundleDocument.class
deleted file mode 100644
index 1be4d7985..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/BundleDocument.class and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/GenericApp.icns b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/GenericApp.icns
deleted file mode 100644
index 20d16f39a..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/GenericApp.icns and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/JavaAppLauncher b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/JavaAppLauncher
deleted file mode 100755
index 8c26a7a6f..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/JavaAppLauncher and /dev/null differ
diff --git a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Option.class b/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Option.class
deleted file mode 100644
index aa4a23818..000000000
Binary files a/build/macosx/appbundler/bin/classes/com/oracle/appbundler/Option.class and /dev/null differ
diff --git a/build/macosx/appbundler/build.properties b/build/macosx/appbundler/build.properties
deleted file mode 100644
index aa2815171..000000000
--- a/build/macosx/appbundler/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2012, Oracle and/or its affiliates. All rights reserved.
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-version=1.0ea
-arch64=-arch x86_64
-arch32=-arch i386
-archppc=-arch ppc
-cc=gcc
diff --git a/build/macosx/appbundler/build.xml b/build/macosx/appbundler/build.xml
index 867cfbc2d..e0a5e5b3b 100644
--- a/build/macosx/appbundler/build.xml
+++ b/build/macosx/appbundler/build.xml
@@ -28,7 +28,14 @@ questions.
 <project name="appbundler" default="package">
     <property environment="env"/>
 
+    <!--
     <property file="build.properties"/>
+    version=1.0ea
+    -->
+    <property name="arch64" value="-arch x86_64" />
+    <property name="arch32" value="-arch i386" />
+    <property name="archppc" value="-arch ppc" />
+    <property name="cc" value="gcc" />
 
     <property name="folder.src" value="src"/>
     <property name="folder.native" value="native"/>
@@ -98,7 +105,7 @@ questions.
             <fileset dir="${folder.res}"/>
         </zip>
 
-        <jar destfile="../${ant.project.name}-${version}.jar" index="true">
+        <jar destfile="../${ant.project.name}.jar" index="true">
             <manifest>
                 <attribute name="Implementation-Vendor-Id" value="com.oracle"/>
                 <attribute name="Implementation-Vendor" value="Oracle"/>
@@ -116,7 +123,7 @@ questions.
     <!-- Test targets -->
     <target name="test" depends="package">
         <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"
-            classpath="${folder.bin}/${ant.project.name}-${version}.jar"/>
+            classpath="${folder.bin}/${ant.project.name}.jar"/>
 
         <bundleapp outputdirectory="."
             name="Test"
@@ -134,7 +141,7 @@ questions.
 
     <target name="test-plugin" depends="package">
         <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"
-            classpath="${folder.bin}/${ant.project.name}-${version}.jar"/>
+            classpath="${folder.bin}/${ant.project.name}.jar"/>
 
         <bundleapp outputdirectory="."
             name="TestPlugin"
diff --git a/core/todo.txt b/core/todo.txt
index 43a27d0e7..2adde90e2 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -3,6 +3,8 @@ X background color for present mode has no effect
 X   https://github.com/processing/processing/issues/2071
 X   https://github.com/processing/processing/pull/2072
 
+_ Sort out blending differences with P2D/P3D
+_   https://github.com/processing/processing/issues/1844
 
 high
 _ loadPixels doesn't set alpha value for pixels on Java2D