simplify build parameters
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index d674c73..ce395a4 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -24,42 +24,6 @@
 # Spec java 1.4 as default vm to use
 export JAVA_HOME=${JAVA_4_HOME}
 
-
-# OS specific support.
-sunjvm=false;
-ibmjvm=false;
-javaversion="`uname -a`"
-
-case "$javaversion" in
-  *i686*) sunjvm=true;;
-  *ppc*)  ibmjvm=true;;
-esac
-
-
-# values of the bootclasspath attribute used in ant javac calls.
-# the names of these jars are VM vendor specific. the first set
-# below, commented out, are typical for sun VM's. The 
-# second set are for IBM's VM's ... which is what we use 
-# on the PPC machine, so we'll leave that as the defaults 
-# in this file. 
-
-
-# set initial values as if for IBM's PPC VM
-export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/xml.jar:${JAVA_4_HOME}/jre/lib/graphics.jar:${JAVA_4_HOME}/jre/lib/server.jar:${JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${JAVA_4_HOME}/jre/lib/security.jar"
-export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar:${JAVA_5_HOME}/jre/lib/graphics.jar:${JAVA_5_HOME}/jre/lib/server.jar:${JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${JAVA_5_HOME}/jre/lib/security.jar"
-export ANT_OPTS="-Xms256m -Xmx1024m"
-export JAVADOC_ARGS="-J-Xms256m -J-Xmx1024m"
-
-
-# and change them if Sun's VM is being used
-if $sunjvm ; then
-	export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
-	export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar:${JAVA_5_HOME}/jre/lib/jsse.jar"
-	export ANT_OPTS="-Xms256m -Xmx1024m -XX:MaxPermSize=128M -XX:+UseParallelGC"
-  export JAVADOC_ARGS="-J-Xms256m -J-Xmx1024m -J-XX:MaxPermSize=256m -J-XX:+UseParallelGC"
-fi
-
-
 export CVS_RSH=ssh
 export CVS_MAIN_REPO=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
 
@@ -72,9 +36,6 @@
 #   and pre-reqs
 export LOCAL_PREREQS_CACHE=${BUILD_HOME}/downloads
 
-# TODO: we need some logic for windows to use "exe"
-export JAVADOC_COMMAND="${JAVA_5_HOME}/bin/javadoc"
-
 # We want everything in our processes to use UTC, even when we can't 
 # change the time or timezone on the build machine.
 export TZ='UTC-0';
diff --git a/releng.control/localBuildExample/buildutilities.properties b/releng.control/localBuildExample/buildutilities.properties
index 5189048..20733ef 100644
--- a/releng.control/localBuildExample/buildutilities.properties
+++ b/releng.control/localBuildExample/buildutilities.properties
@@ -1,2 +1,4 @@
 
-#normalizeJarFiles=true
+# it is faster, for local builds to not do normalization. 
+# it is only needed when pack200 is required
+normalizeJarFiles=false
diff --git a/releng.control/localBuildExample/runbuild.properties b/releng.control/localBuildExample/runbuild.properties
index b2f2c50..2a0b70b 100644
--- a/releng.control/localBuildExample/runbuild.properties
+++ b/releng.control/localBuildExample/runbuild.properties
@@ -3,14 +3,17 @@
 
 
 # some standard ones for Sun
-J2SE-1.4="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
-J2SE-1.5="${JAVA_5_HOME}/jre/lib/rt.jar:${JAVA_5_HOME}/jre/lib/jsse.jar"
+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
 JAVADOC_ARGS=-J-Xms256m -J-Xmx1024m -J-XX:MaxPermSize=256m -J-XX:+UseParallelGC
 
+# need to use exe form for windows
+JAVADOC_COMMAND=${env.JAVA_5_HOME}/bin/javadoc
+
 # some standard ones for IBM's JRE
-#J2SE-1.4=${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/xml.jar:${JAVA_4_HOME}/jre/lib/graphics.jar:${JAVA_4_HOME}/jre/lib/server.jar:${JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${JAVA_4_HOME}/jre/lib/security.jar
-#J2SE-1.5=${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar:${JAVA_5_HOME}/jre/lib/graphics.jar:${JAVA_5_HOME}/jre/lib/server.jar:${JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${JAVA_5_HOME}/jre/lib/security.jar
+#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"
 #JAVADOC_ARGS="-J-Xms256m -J-Xmx1024m"
 
diff --git a/releng.control/standardMachineProperties/buildutilities.properties b/releng.control/standardMachineProperties/buildutilities.properties
deleted file mode 100644
index aeb85a3..0000000
--- a/releng.control/standardMachineProperties/buildutilities.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-
-normalizeJarFiles=true
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 521bd42..8fde727 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -320,12 +320,7 @@
         <property
             name="ANT_OPTS"
             value="-Xms256m -Xmx1024m" />
-        <property
-            name="JAVADOC_ARGS"
-            value="-J-Xms256m -J-Xmx1024m" />
-        <property
-            name="JAVADOC_COMMAND"
-            value="${env.JAVA_5_HOME}/bin/javadoc" />
+
         <property
             name="build.trial"
             value="true" />