diff --git a/build/build.xml b/build/build.xml
index 06a3e0bb8..66f22a22b 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -27,9 +27,53 @@
     <equals arg1="${sun.arch.data.model}" arg2="64" />
   </condition>
 
+  <fileset dir="windows/work/java" id="jre-optional-windows">
+    <include name="bin/dtplugin" />
+    <include name="bin/plugin2" />
+
+    <include name="bin/kinit.exe" />
+    <include name="bin/klist.exe" />
+    <include name="bin/ktab.exe" />
+
+    <include name="bin/keytool" />
+    <include name="bin/orbd" />
+    <include name="bin/policytool" />
+    <include name="bin/rmid" />
+    <include name="bin/rmiregistry" />
+    <include name="bin/servertool" />
+    <include name="bin/tnameserv" />
+
+    <include name="bin/javaws.exe" />
+    <include name="lib/javaws.jar" />
+
+    <include name="lib/ext/dnsns.jar" />
+    <include name="lib/cmm/PYCC.pf" />
+  </fileset>
+
+  <fileset dir="linux/work/java" id="jre-optional-linux">
+    <include name="bin/keytool" />
+    <include name="bin/orbd" />
+    <include name="bin/policytool" />
+    <include name="bin/rmid" />
+    <include name="bin/rmiregistry" />
+    <include name="bin/servertool" />
+    <include name="bin/tnameserv" />
+
+    <include name="bin/javaws" />
+    <include name="lib/javaws.jar" />
+
+    <include name="lib/ext/dnsns.jar" />
+    <include name="lib/cmm/PYCC.pf" />
+  </fileset>
+
+  <!-- There might be others, based on what was in the Java 6 docs, 
+       but that info isn't part of the Java 7 instructions.
+       http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html -->
+
   <!-- Unused JavaFX files that can be removed from the JRE on Windows 
        and Linux. On Mac OS X, this is removed by the appbundler task.
        www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html -->
+
   <fileset dir="${platform}/work/java" id="javafx-basics">
     <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" />
     <include name="lib/javafx.properties" />
@@ -158,18 +202,6 @@
     <antcall target="${platform}-dist" />
   </target>
 
-<!--
-  <target name="android-dist-check">
--->
-    <!-- ensure that the android-core.zip file has been built -->
-<!--
-    <available file="${target.path}/modes/android/android-core.zip" 
-	       property="android-core-present" />
-    <fail unless="android-core-present" 
-	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
-  </target>
--->
-
   <!-- "§$§$&, ant doesn't have a built-in help target :(  -->
   <target name="help" description="Show project help">
     <java classname="org.apache.tools.ant.Main">
@@ -774,10 +806,11 @@
     </exec>
     <move file="linux/jre1.7.0_40" tofile="linux/work/java" />
 
-    <!-- Remove unused JavaFX crap. -->
+    <!-- Remove unused JRE bloat. -->
     <delete> 
       <fileset refid="javafx-basics" />
       <fileset refid="javafx-linux-${sun.arch.data.model}" />
+      <fileset refid="jre-optional-linux" />
     </delete>
 
   </target>
@@ -975,6 +1008,7 @@
     <delete> 
       <fileset refid="javafx-basics" />
       <fileset refid="javafx-windows" />
+      <fileset refid="jre-optional-windows" />
     </delete>
   </target>
   
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
deleted file mode 100755
index 85f50779a..000000000
--- a/build/macosx/template.app/Contents/Info.plist
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-  <dict>
-    <key>CFBundleName</key>
-    <string>Processing</string>
-
-    <!-- all these need to change for new releases -->
-    <key>CFBundleGetInfoString</key>
-    <string>VERSION, Copyright © Ben Fry and Casey Reas</string>
-    <key>CFBundleVersion</key>
-    <string>REVISION</string>
-    <key>CFBundleShortVersionString</key>
-    <string>VERSION</string>
-    <!-- now stop changing things and get outta here -->
-
-    <key>CFBundleAllowMixedLocalizations</key>
-    <string>true</string>
-    <key>CFBundleExecutable</key>
-    <string>JavaApplicationStub</string>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>Pde1</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleIconFile</key>
-    <string>processing.icns</string>
-    <key>CFBundleIdentifier</key> 
-    <string>org.processing.app</string>
-
-    <key>CFBundleDocumentTypes</key>
-    <array>
-      <dict>
-        <key>CFBundleTypeExtensions</key>
-        <array>
-          <string>pde</string>
-          <string>java</string>
-        </array>
-        <key>CFBundleTypeIconFile</key>
-        <string>pde.icns</string>
-      	<key>CFBundleTypeName</key>
-        <string>Processing Source File</string>
-        <key>CFBundleTypeMIMETypes</key>
-        <array>
-          <string>text/plain</string>
-        </array>
-        <key>CFBundleTypeOSTypes</key>
-        <array>
-          <string>TEXT</string>
-        </array>
-        <key>CFBundleTypeRole</key>
-        <string>Editor</string>
-      </dict>
-    </array>
-
-    <!-- Do not change this. If you do, do not file a bug. -->
-    <key>LSMinimumSystemVersion</key>
-    <string>10.6.8</string>
-
-    <key>NSHighResolutionCapable</key>
-    <true/>
-
-    <key>Java</key>
-    <dict>
-      <key>SplashFile</key>
-      <string>$JAVAROOT/lib/about.jpg</string>
-
-      <key>VMOptions</key>
-      <array>
-        <string>-Xms128M</string>
-        <string>-Xmx256M</string>
-      </array>
-
-      <key>MainClass</key>
-      <string>processing.app.Base</string>
-
-      <!-- As of 2.0a2 we are now requiring Java 1.6. We don't yet support
-	   Java 7 on OS X (because of lack of retina and JOGL support).
-	   Switching this to 1.7 will likely break lots of things. -->
-      <key>JVMVersion</key>
-      <string>1.6*</string>
-
-      <key>ClassPath</key>
-      <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
-           it can cause problems if users have installed weird files there.
-           http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/lib/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/lib/ant.jar:$JAVAROOT/lib/ant-launcher.jar:$JAVAROOT/lib/antlr.jar:$JAVAROOT/lib/jna.jar:$JAVAROOT/lib/org-netbeans-swing-outline.jar:$JAVAROOT/lib/com.ibm.icu_4.4.2.v20110823.jar:$JAVAROOT/lib/jdi.jar:$JAVAROOT/lib/jdimodel.jar:$JAVAROOT/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</string>
-
-      <!-- More properties can be found in http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
-      <key>Properties</key>
-      <dict>
-	<!-- Pass the full path of Contents/Resources/Java to the PDE -->
-	<key>javaroot</key>
-	<string>$JAVAROOT</string>
-
-	<!-- as of 1.0.8, it's safe to use this option again -->
-        <key>apple.laf.useScreenMenuBar</key>
-        <string>true</string>
-
-	<key>apple.awt.showGrowBox</key>
-	<string>true</string>
-	<key>com.apple.smallTabs</key>
-	<string>true</string>
-	<key>apple.awt.Antialiasing</key>
-	<string>false</string>
-	<key>apple.awt.TextAntialiasing</key>
-	<string>true</string>
-	<key>com.apple.hwaccel</key>
-	<string>true</string>
-	<key>apple.awt.use-file-dialog-packages</key>
-	<string>false</string>
-	<key>apple.awt.graphics.UseQuartz</key>
-	<string>true</string>
-      </dict>
-    </dict>
-  </dict>
-</plist>
diff --git a/build/macosx/template.app/Contents/MacOS/JavaApplicationStub b/build/macosx/template.app/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 739948527..000000000
Binary files a/build/macosx/template.app/Contents/MacOS/JavaApplicationStub and /dev/null differ
diff --git a/build/macosx/template.app/Contents/PkgInfo b/build/macosx/template.app/Contents/PkgInfo
deleted file mode 100755
index 3f338b4a0..000000000
--- a/build/macosx/template.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPLPde1
\ No newline at end of file
diff --git a/build/macosx/template.app/Contents/Resources/pde.icns b/build/macosx/template.app/Contents/Resources/pde.icns
deleted file mode 100644
index 214b19877..000000000
Binary files a/build/macosx/template.app/Contents/Resources/pde.icns and /dev/null differ
diff --git a/build/macosx/template.app/Contents/Resources/processing.icns b/build/macosx/template.app/Contents/Resources/processing.icns
deleted file mode 100644
index 901fc569e..000000000
Binary files a/build/macosx/template.app/Contents/Resources/processing.icns and /dev/null differ
diff --git a/todo.txt b/todo.txt
index bcc12b8cd..a6ae7e288 100644
--- a/todo.txt
+++ b/todo.txt
@@ -29,17 +29,20 @@ X   any missing args from our app (copyrights/versions?)
 X   add MinimumSystemVersion for 10.7.3
 X copy GenericDocumentIcon.icns for placeholder icon
 X   from /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
-X remove Java FX from OS X build
+_ remove JAVA_HOME requirement from build.xml
+_   what's needed on OS X? just the JDK 7u40?
 
-_ remove Java FX during Linux builds
-_ remove Java FX during Windows builds
-_ remove javafx from the embed
-_   more about optional files:
-_   http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html
+jre work
+X remove Java FX from OS X build
+X remove Java FX during Linux builds
+X remove Java FX during Windows builds
+X remove javafx from the embed
+X   more about optional files:
+X   http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html
 
 7u40 switch
 _ make OS X launch from its local JRE
-_ don't re-copy jre into work folder if already exists
+
 _ change how export is handled
 _   remove ability to export cross-platform apps
 _   add ability to embed the current JRE
@@ -53,11 +56,17 @@ _   requires 10.7.3 or later (which can be specified in min sys version)
 _   https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/20001431-113253
 _ try the bundle on Mac Mini running 10.6
 _   make sure it's only running on 64-bit machines? 
+_ try installing 10.7.3 on Mac Mini and check whether things run
 _ bring back the splash screen
 _ update github instructions
 _   only JRE needed at this point
 _   switched over to Java 7
 _   https://github.com/processing/processing/wiki/Build-Instructions
+_   "unable to locate tools.jar" (Windows) can be ignored
+_   JAVA_HOME warnings from Ant can also be ignored
+
+_ appbundler improvements
+_   don't re-copy JRE into work folder if already exists
 
 high
 _ move old Google Code SVN back to processing.org