diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
--- features/org.eclipse.jdt/build.xml	2006-09-19 10:58:38.000000000 -0400
+++ features/org.eclipse.jdt/build.xml	2006-09-21 18:31:13.000000000 -0400
@@ -12,11 +12,6 @@
 			<property name="os" value="win32"/>
 			<property name="ws" value="win32"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.junit4" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="os" value="win32"/>
-			<property name="ws" value="win32"/>
-		</ant>
 		<ant antfile="build.xml" dir="../../plugins/org.junit" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="os" value="win32"/>
@@ -27,11 +22,6 @@
 			<property name="os" value="win32"/>
 			<property name="ws" value="win32"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="os" value="win32"/>
-			<property name="ws" value="win32"/>
-		</ant>
 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.core" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="os" value="win32"/>
@@ -77,16 +67,6 @@
 			<property name="os" value="win32"/>
 			<property name="ws" value="win32"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="os" value="win32"/>
-			<property name="ws" value="win32"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="os" value="win32"/>
-			<property name="ws" value="win32"/>
-		</ant>
 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="os" value="win32"/>
@@ -150,7 +130,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml"  selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.apt.core,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.apt.ui,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.core,3.2.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,org.eclipse.jdt.junit4.runtime,1.0.1.r321_v20060905,org.eclipse.jdt.launching,3.2.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,org.junit,3.8.1,org.junit4,4.1.0.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml"  selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.core,3.2.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,org.eclipse.jdt.launching,3.2.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">
diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
--- features/org.eclipse.jdt/feature.xml	2006-07-04 13:40:47.000000000 -0400
+++ features/org.eclipse.jdt/feature.xml	2006-07-04 12:05:17.000000000 -0400
@@ -38,20 +38,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.apt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.jdt.core"
          download-size="0"
          install-size="0"
@@ -91,13 +77,6 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.jdt.junit4.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-   <plugin
          id="org.eclipse.jdt.launching"
          download-size="0"
          install-size="0"
@@ -118,12 +97,6 @@
          version="3.8.1"/>
 
    <plugin
-         id="org.junit4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-   <plugin
          id="org.eclipse.jdt.doc.user"
          download-size="0"
          install-size="0"
diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
--- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:40:47.000000000 -0400
+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:30:48.000000000 -0400
@@ -75,7 +75,7 @@
 		<exec dir="." executable="${javadoc}" output="doc.bin.log">
 			<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
 		</exec>
-		<antcall target="generateJdtAptJavadoc" />
+	        <!-- <antcall target="generateJdtAptJavadoc" /> -->
 	</target>
 	
 	<target name="generateJdtAptJavadoc">
diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
--- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:40:47.000000000 -0400
+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:42:37.000000000 -0400
@@ -22,12 +22,10 @@
 ;../org.eclipse.jdt.ui/ui refactoring
 ;../org.eclipse.jdt.ui/core extension
 ;../org.eclipse.jdt.core.manipulation/refactoring
-;../org.eclipse.jdt.core.manipulation/common
-;../org.eclipse.jdt.apt.core/src"
+;../org.eclipse.jdt.core.manipulation/common"
 -d reference/api
 -classpath @rt@
 ;../../baseLocation/plugins/com.ibm.icu_3.4.5.jar
-;../org.eclipse.jdt.apt.core/mirrorapi.jar
 ;../org.apache.ant/lib/ant.jar
 ;../org.eclipse.compare/@dot
 ;../org.eclipse.core.commands/@dot
diff -ruN assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-09-21 10:55:43.000000000 -0400
+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-09-23 05:08:48.000000000 -0400
@@ -97,9 +97,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp.source.linux.gtk.ia64" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -109,9 +106,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -139,9 +133,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -157,9 +148,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -451,10 +439,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -491,10 +475,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -515,10 +495,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
 		</antcall>
 		<antcall target="jarUp">
diff -ruN assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
--- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-09-21 10:55:43.000000000 -0400
+++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-09-23 05:23:13.000000000 -0400
@@ -94,18 +94,12 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -133,9 +127,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -151,9 +142,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -442,10 +430,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -482,10 +466,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -506,10 +486,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
 		</antcall>
 		<antcall target="jarUp">
diff -ruN assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
--- assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-09-21 10:55:42.000000000 -0400
+++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-09-23 05:22:28.000000000 -0400
@@ -94,18 +94,12 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -136,9 +130,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -154,9 +145,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -451,10 +439,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -495,10 +479,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -519,10 +499,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
 		</antcall>
 		<antcall target="jarUp">
diff -ruN assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
--- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-09-21 10:55:43.000000000 -0400
+++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-09-23 05:24:32.000000000 -0400
@@ -97,18 +97,12 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -139,9 +133,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -157,9 +148,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -454,10 +442,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -494,10 +478,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -518,10 +498,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
 		</antcall>
 		<antcall target="jarUp">
diff -ruN assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
--- assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-09-21 10:55:42.000000000 -0400
+++ assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-09-23 05:23:56.000000000 -0400
@@ -97,18 +97,12 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -136,9 +130,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -157,9 +148,6 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.x86" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
-		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -454,10 +442,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -494,10 +478,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -522,10 +502,6 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-		</antcall>
-		<antcall target="jarUp">
-			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
 		</antcall>
 		<antcall target="jarUp">