cleanup
diff --git a/releng.control/localBuildExample/runbuild.properties b/releng.control/localBuildExample/runbuild.properties
index 25b622b..5136a93 100644
--- a/releng.control/localBuildExample/runbuild.properties
+++ b/releng.control/localBuildExample/runbuild.properties
@@ -1,16 +1,14 @@
 
-# adjust depending on which VM's are being used on this machine
+# adjust classpaths depending on which VM's 
+# are being used on this build machine. 
 
 
 # some standard ones for Sun
 J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/rt.jar:${env.JAVA_4_HOME}/jre/lib/jsse.jar
 J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/rt.jar:${env.JAVA_5_HOME}/jre/lib/jsse.jar
-ANT_OPTS=-Xms256m -Xmx1024m -XX:MaxPermSize=128M -XX:+UseParallelGC
 
 # some standard ones for IBM's JRE
 #J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar
 #J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar
-#ANT_OPTS=-Xms256m -Xmx1024m
-
 
 # Other Execution Environment classpaths should be added, if/when we need them
diff --git a/releng.control/localBuildExample/upload.properties b/releng.control/localBuildExample/upload.properties
index 266bd48..d275e5a 100644
--- a/releng.control/localBuildExample/upload.properties
+++ b/releng.control/localBuildExample/upload.properties
@@ -1,22 +1,19 @@
-#  	upload.properties
-
-# 		These are some properties needed to upload builds from the build machine to the download machine. 
-# 		The actual task that does that is in wtp.upload in releng.wtpBuidler. 
-# 		Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
+# upload.properties
 
 
-# 		Use care with "true" unless you really 
-# 		have a place for the builds to go. You 
-# 		would not want them to accidently go to eclipse.org
-build.upload=false
- 
+
+# These are some properties needed to upload builds from 
+# a build machine to some download machine. These are 
+# ignored if UPLOAD_BUILD environment variable is set to false.
+# 
 uploadUser=davidw
 uploadPassword="This is not really used since ssh login is assumed (required)"
 uploadServer=localhost
 uploadRemoteDirectory=/var/www/html/buildhome/webtools/${site-sub-dir}/drops/${buildBranch}
 
-# 		rsyncRootPrefix should be empty for Linux machines.
-# 		But, Windows using cygwin will needs something like /cygdrive/G/
-# 		for what ever drive or directory is parent of build home
+# rsyncRootPrefix should be empty for Linux machines.
+# But, Windows using cygwin will need something like /cygdrive/G/
+# for what ever drive or directory is parent of build home.
+# This is allow rsync to work (using cygwin).
+#
 # rsyncRootPrefix=
-
diff --git a/releng.wtpbuilder/localBuildExample/runbuild.properties b/releng.wtpbuilder/localBuildExample/runbuild.properties
index 25b622b..ad925d6 100644
--- a/releng.wtpbuilder/localBuildExample/runbuild.properties
+++ b/releng.wtpbuilder/localBuildExample/runbuild.properties
@@ -5,12 +5,9 @@
 # some standard ones for Sun
 J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/rt.jar:${env.JAVA_4_HOME}/jre/lib/jsse.jar
 J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/rt.jar:${env.JAVA_5_HOME}/jre/lib/jsse.jar
-ANT_OPTS=-Xms256m -Xmx1024m -XX:MaxPermSize=128M -XX:+UseParallelGC
 
 # some standard ones for IBM's JRE
 #J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar
 #J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar
-#ANT_OPTS=-Xms256m -Xmx1024m
-
 
 # Other Execution Environment classpaths should be added, if/when we need them
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index a64e085..918ac5b 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -308,9 +308,6 @@
         <property
             name="J2SE-1.5"
             value="${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar" />
-        <property
-            name="ANT_OPTS"
-            value="-Xms256m -Xmx1024m" />
 
         <property
             name="build.trial"