improving machine variations
diff --git a/archive/releng.builder/tools/cruise/committer.xml b/archive/releng.builder/tools/cruise/committer.xml
index 8bcaf9e..6003cd5 100644
--- a/archive/releng.builder/tools/cruise/committer.xml
+++ b/archive/releng.builder/tools/cruise/committer.xml
@@ -1,50 +1,51 @@
 <project default="Build">
 
-	<property file="committer.properties" />
+    <property file="committer.properties" />
 
-	<target name="Build">
-		
-		<property name="wtpBuilder" value="${build.home}/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml"/>
 
-		<antcall target="clean" />
-		
-		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
-			<property name="codir" value="${build.home}/build-node/checkout/${build.distribution}-${buildType}" />
-			<property name="buildType" value="${buildType}" />
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-		</ant>
 
-	    
-	    
-		<ant antfile="${wtpBuilder}" target="build" />
-		<ant antfile="${wtpBuilder}" target="site" />
-	    
+    <target name="Build">
+
+
+        <property name="wtpBuilder" value="${build.home}/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml"/>
+
+        <antcall target="clean" />
+
+        <ant antfile="checkout.xml" target="all" dir="." inheritall="false">
+            <property name="codir" value="${build.home}/build-node/checkout/${build.distribution}-${buildType}" />
+            <property name="buildType" value="${buildType}" />
+            <property name="mapVersionTag" value="${mapVersionTag}" />
+        </ant>
+
+
+        <ant antfile="${wtpBuilder}" target="build" />
+        <ant antfile="${wtpBuilder}" target="site" />
+
         <property name="wtpbuilder.upload.properties.file" value="${basedir}/upload.properties" />
         <ant antfile="${wtpBuilder}" target="upload" />
 
-	
-	    
-		<ant antfile="${wtpBuilder}" target="test" />
-		<ant antfile="${wtpBuilder}" target="site" />
 
-	    <property name="wtpbuilder.upload.properties.file" value="${basedir}/upload.properties" />
+        <ant antfile="${wtpBuilder}" target="test" />
+        <ant antfile="${wtpBuilder}" target="site" />
+
+        <property name="wtpbuilder.upload.properties.file" value="${basedir}/upload.properties" />
         <ant antfile="${wtpBuilder}" target="upload" />
 
-	    
-	    
-	    <ant antfile="${wtpBuilder}" target="upload" />
-		<ant antfile="${wtpBuilder}" target="whatisfixed" />
-
-	    <property name="wtpbuilder.upload.properties.file" value="${basedir}/upload.properties" />
-        <ant antfile="${wtpBuilder}" target="upload" />
-	</target>
+    </target>
 
 
 
-	<target name="clean" if="build.clean">
-		<delete dir="${build.home}/build-${build.distribution}-${buildType}" failonerror="false" />
-		<delete dir="${build.home}/test-${build.distribution}-${buildType}" failonerror="false" />
-	</target>
+    <target name="clean" depends="check.clean" if="doClean">
+        <delete dir="${build.home}/build-${build.distribution}-${buildType}" failonerror="false" />
+        <delete dir="${build.home}/test-${build.distribution}-${buildType}" failonerror="false" />
+    </target>
 
 
-</project>
\ No newline at end of file
+    <target name="check.clean">
+        <condition property="doClean">
+            <equals arg1="${build.clean}" arg2="true" />
+        </condition>
+    </target>
+
+
+</project>