--- jsr166/build.xml	2016/03/26 15:10:14	1.202
+++ jsr166/build.xml	2016/03/26 17:35:47	1.205
@@ -407,17 +407,12 @@
       <compilerarg line="${build.args}"/>
 
     </javac>
-
-    <!-- We need jdk9's Contended annotation, but at compile time only -->
-    <!--
-        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
-    -->
   </target>
 
 
   <target name="jar"
           depends="compile"
-          description="Builds library jar from compiled sources">
+          description="Builds library jar for src/main from compiled sources">
 
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
@@ -526,7 +521,7 @@
 
   <target name="tck"
 	  depends="jar"
-          description="Runs tck tests for main directly">
+          description="Runs tck tests for src/main directly">
 
     <run-tck-tests
       target="${build.main.java.version}"
@@ -550,7 +545,7 @@
 
   <target name="jtreg"
 	  depends="jar"
-          description="Runs jtreg tests for main using the jtreg ant task">
+          description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
        target="${build.main.java.version}"
        workdir="${build.dir}"
@@ -559,34 +554,34 @@
 
   <target name="test"
           depends="tck, tck-parallelism-1, jtreg"
-          description="Runs tck and jtreg tests for main">
+          description="Runs tck and jtreg tests for src/main">
   </target>
 
-  <target name="jtreg8" description="Runs jtreg tests with jdk8">
+<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
 
-    <antcall target="jtreg">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
-    </antcall>
+<!--     <antcall target="jtreg"> -->
+<!--       <param name="build.main.java.version" value="8"/> -->
+<!--       <param name="build.main.javac" value="${javac8}"/> -->
+<!--     </antcall> -->
 
-  </target>
+<!--   </target> -->
 
-  <target name="test89"
-          description="Runs tck and jtreg tests for main for multiple java versions">
+<!--   <target name="test89" -->
+<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
 
-    <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
-    </antcall>
+<!--     <antcall target="clean"/> -->
+<!--     <antcall target="test"> -->
+<!--       <param name="build.main.java.version" value="8"/> -->
+<!--       <param name="build.main.javac" value="${javac8}"/> -->
+<!--     </antcall> -->
 
-    <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="9"/>
-      <param name="build.main.javac" value="${javac9}"/>
-    </antcall>
+<!--     <antcall target="clean"/> -->
+<!--     <antcall target="test"> -->
+<!--       <param name="build.main.java.version" value="9"/> -->
+<!--       <param name="build.main.javac" value="${javac9}"/> -->
+<!--     </antcall> -->
 
-  </target>
+<!--   </target> -->
 
 
 
@@ -616,8 +611,8 @@
   <!-- Various demos and test programs -->
 
 
-  <target name="loops" depends="configure-compiler"
-          description="Benchmark from Doug Lea's AQS paper">
+  <!-- description="Benchmark from Doug Lea's AQS paper" -->
+  <target name="loops" depends="configure-compiler">
 
     <mkdir dir="${build.loops.dir}"/>
 
@@ -941,9 +936,9 @@
   </target>
 
 
+  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
   <target name="4jdk7-tck-junit"
-          depends="4jdk7compile"
-          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
+          depends="4jdk7compile">
 
     <junit printsummary="true"
            showoutput="true"