diff --git a/geronimo-specs.build.xml b/geronimo-specs.build.xml
index 4415eff..09da1e7 100644
--- a/geronimo-specs.build.xml
+++ b/geronimo-specs.build.xml
@@ -24,10 +24,6 @@
   <property name="annotation.dir" value="${annotation.id}-${annotation}" />
   <property name="annotation.jar" value="${annotation.id}-${annotation.ver}.jar" />
   
-  <property name="el10"           value="1.0" />
-  <property name="el10.dir"       value="geronimo-el_1.0_spec-${el10}" />
-  <property name="el10.jar"       value="${el10.dir}.jar" />
-
   <property name="javamail13"     value="1.3" />
   <property name="javamail13.ver" value="1.3" />
   <property name="javamail13.id"  value="geronimo-javamail_1.3.1_spec" />
@@ -57,15 +53,6 @@
   <property name="jpa.dir"        value="geronimo-jpa_3.0_spec-${jpa}" />
   <property name="jpa.jar"        value="geronimo-jpa_3.0_spec-1.1.jar" />
   
-  <property name="jsp20"          value="1.1" />
-  <property name="jsp20.id"       value="geronimo-jsp_2.0_spec" />
-  <property name="jsp20.dir"      value="${jsp20.id}-${jsp20}" />
-  <property name="jsp20.jar"      value="${jsp20.dir}.jar" />
-
-  <property name="jsp21"          value="1.0" />
-  <property name="jsp21.dir"      value="geronimo-jsp_2.1_spec-${jsp21}" />
-  <property name="jsp21.jar"      value="${jsp21.dir}.jar" />
-  
   <property name="jta10"          value="1.1.1" />
   <property name="jta10.id"       value="geronimo-jta_1.0.1B_spec" />
   <property name="jta10.dir"      value="${jta10.id}-${jta10}" />
@@ -94,18 +81,10 @@
   <property name="servlet25.dir"  value="geronimo-servlet_2.5_spec-${servlet25}" />
   <property name="servlet25.jar"  value="${servlet25.dir}.jar" />
   
-  <property name="stax"           value="1.0" />
-  <property name="stax.dir"       value="geronimo-stax-api_1.0_spec-${stax}" />
-  <property name="stax.jar"       value="${stax.dir}.jar" />
-  
-  <property name="wsmetadata"     value="1.1.1" />
-  <property name="wsmetadata.dir" value="geronimo-ws-metadata_2.0_spec-${wsmetadata}" />
-  <property name="wsmetadata.jar" value="${wsmetadata.dir}.jar" />
-
   <target name="dist" depends="build">
   </target>
   
-  <target name="build" depends="activation102, activation110, annotation, el10, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata">
+  <target name="build" depends="activation102, activation110, annotation, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jta10, jta11, qname, saaj, servlet24, servlet25">
   </target>
 
   <!--
@@ -175,13 +154,6 @@ artifactId=${gbuild.id}
       </antcall>
   </target>
   
-  <target name="el10">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${el10.dir}" />
-          <param name="gbuild.jar" value="${el10.jar}" />
-      </antcall>
-  </target>
-  
   <target name="javamail13" depends="activation102">
       <antcall target="gbuild">
           <param name="gbuild.dir" value="${javamail13.dir}" />
@@ -236,24 +208,6 @@ artifactId=${gbuild.id}
       </antcall>
   </target>
   
-  <target name="jsp20" depends="servlet24">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${jsp20.dir}" />
-          <param name="gbuild.jar" value="${jsp20.jar}" />
-          <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}"/>
-          <param name="gbuild.id"  value="${jsp20.id}" />
-          <param name="gbuild.ver" value="${jsp20}" />
-      </antcall>
-  </target>
-  
-  <target name="jsp21" depends="servlet24, el10">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${jsp21.dir}" />
-          <param name="gbuild.jar" value="${jsp21.jar}" />
-          <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}:${el10.dir}/${dist}/${el10.jar}"/>
-      </antcall>
-  </target>
-  
   <target name="jta10">
       <antcall target="gbuild">
           <param name="gbuild.dir" value="${jta10.dir}" />
@@ -305,20 +259,6 @@ artifactId=${gbuild.id}
       </antcall>
   </target>
   
-  <target name="stax">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${stax.dir}" />
-          <param name="gbuild.jar" value="${stax.jar}" />
-      </antcall>
-  </target>
-  
-  <target name="wsmetadata">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${wsmetadata.dir}" />
-          <param name="gbuild.jar" value="${wsmetadata.jar}" />
-      </antcall>
-  </target>
-  
   <target name="clean" description="clean up" >
     <delete dir="geronimo-spec-j2ee/${dist}" />
   </target>
diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index 2939d76..d0fe0b1 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -143,20 +143,6 @@ J2EE-Specifications Note: You should use the subpackages for the
 Specifications that you actually need.	The ones installed by the main
 package are deprecated and will disapear in future releases.
 
-%package -n geronimo-el-1_0-api
-Summary:        Geronimo J2EE server J2EE specifications
-Group:          Development/Languages/Java
-Requires(pre):  update-alternatives
-Provides:       el_1_0_api = %{version}
-Provides:       el_api = 1.0
-Obsoletes:      %{name}-poms
-
-%description -n geronimo-el-1_0-api
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications Note: You should use the subpackages for the
-Specifications that you actually need.	The ones installed by the main
-package are deprecated and will disapear in future releases.
-
 %package -n geronimo-javamail-1_3_1-api
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -255,39 +241,6 @@ J2EE-Specifications Note: You should use the subpackages for the
 Specifications that you actually need.	The ones installed by the main
 package are deprecated and will disapear in future releases.
 
-%package -n geronimo-jsp-2_0-api
-Summary:        Geronimo J2EE server J2EE specifications
-Group:          Development/Languages/Java
-Requires:       servlet_2_4_api
-Requires(pre):  update-alternatives
-Provides:       jsp = 2.0
-# TODO: drop asap
-Provides:       jsp_2_0_api = %{version}
-Provides:       jsp_api = 2.0
-Obsoletes:      %{name}-poms
-
-%description -n geronimo-jsp-2_0-api
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications: JavaServer Pages Specification
-
-%package -n geronimo-jsp-2_1-api
-Summary:        Geronimo J2EE server J2EE specifications
-Group:          Development/Languages/Java
-Requires:       el_1_0_api
-Requires:       servlet_2_5_api
-Requires(pre):  update-alternatives
-Provides:       jsp = 2.1
-# TODO: drop asap
-Provides:       jsp_2_1_api = %{version}
-Provides:       jsp_api = 2.1
-Obsoletes:      %{name}-poms
-
-%description -n geronimo-jsp-2_1-api
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications Note: You should use the subpackages for the
-Specifications that you actually need.	The ones installed by the main
-package are deprecated and will disapear in future releases.
-
 %package -n geronimo-jta-1_0_1B-api
 Summary:        Geronimo J2EE server J2EE specifications
 # Don't obsolete jta, as this is provided by java-1.4.2-gcj-compat
@@ -379,34 +332,6 @@ J2EE-Specifications Note: You should use the subpackages for the
 Specifications that you actually need.	The ones installed by the main
 package are deprecated and will disapear in future releases.
 
-%package -n geronimo-stax-1_0-api
-Summary:        Geronimo J2EE server J2EE specifications
-Group:          Development/Languages/Java
-Requires(pre):  update-alternatives
-Provides:       stax_1_0_api = %{version}
-Provides:       stax_api = 1.0
-Obsoletes:      %{name}-poms
-
-%description -n geronimo-stax-1_0-api
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications Note: You should use the subpackages for the
-Specifications that you actually need.	The ones installed by the main
-package are deprecated and will disapear in future releases.
-
-%package -n geronimo-ws-metadata-2_0-api
-Summary:        Geronimo J2EE server J2EE specifications
-Group:          Development/Languages/Java
-Requires(pre):  update-alternatives
-Provides:       ws_metadata_2_0_api = %{version}
-Provides:       ws_metadata_api = 2.0
-Obsoletes:      %{name}-poms
-
-%description -n geronimo-ws-metadata-2_0-api
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications Note: You should use the subpackages for the
-Specifications that you actually need.	The ones installed by the main
-package are deprecated and will disapear in future releases.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -447,13 +372,6 @@ install -m 0644 \
   %{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom
 %add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" -f annotation-1.0-api
 
-install -m 0644 \
-  geronimo-el_1.0_spec-1.0/target/geronimo-el_1.0_spec-1.0.jar \
-  %{buildroot}%{_javadir}/geronimo-el-1.0-api.jar
-%{mvn_install_pom} geronimo-el_1.0_spec-1.0/pom.xml \
-  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-el-1.0-api.pom
-%add_maven_depmap JPP-geronimo-el-1.0-api.pom geronimo-el-1.0-api.jar -f el-1.0-api
-
 install -m 0644 \
   geronimo-javamail_1.3.1_spec-1.3/target/geronimo-javamail_1.3.1_spec-1.3.jar \
   %{buildroot}%{_javadir}/geronimo-javamail-1.3.1-api.jar
@@ -496,20 +414,6 @@ install -m 0644 \
   %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jpa-3.0-api.pom
 %add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api -a javax.persistence:persistence-api
 
-install -m 0644 \
-  geronimo-jsp_2.0_spec-1.1/target/geronimo-jsp_2.0_spec-1.1.jar \
-  %{buildroot}%{_javadir}/geronimo-jsp-2.0-api.jar
-%{mvn_install_pom} geronimo-jsp_2.0_spec-1.1/pom.xml \
-  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.0-api.pom
-%add_maven_depmap JPP-geronimo-jsp-2.0-api.pom geronimo-jsp-2.0-api.jar -f jsp-2.0-api
-
-install -m 0644 \
-  geronimo-jsp_2.1_spec-1.0/target/geronimo-jsp_2.1_spec-1.0.jar \
-  %{buildroot}%{_javadir}/geronimo-jsp-2.1-api.jar
-%{mvn_install_pom} geronimo-jsp_2.1_spec-1.0/pom.xml \
-  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.1-api.pom
-%add_maven_depmap JPP-geronimo-jsp-2.1-api.pom geronimo-jsp-2.1-api.jar -f jsp-2.1-api
-
 install -m 0644 \
   geronimo-jta_1.0.1B_spec-1.1.1/target/geronimo-jta_1.0.1B_spec-1.1.1.jar \
   %{buildroot}%{_javadir}/geronimo-jta-1.0.1B-api.jar
@@ -552,20 +456,6 @@ install -m 0644 \
   %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.5-api.pom
 %add_maven_depmap JPP-geronimo-servlet-2.5-api.pom geronimo-servlet-2.5-api.jar -f servlet-2.5-api
 
-install -m 0644 \
-  geronimo-stax-api_1.0_spec-1.0/target/geronimo-stax-api_1.0_spec-1.0.jar \
-  %{buildroot}%{_javadir}/geronimo-stax-1.0-api.jar
-%{mvn_install_pom} geronimo-stax-api_1.0_spec-1.0/pom.xml \
-  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-stax-1.0-api.pom
-%add_maven_depmap JPP-geronimo-stax-1.0-api.pom geronimo-stax-1.0-api.jar -f stax-1.0-api
-
-install -m 0644 \
-  geronimo-ws-metadata_2.0_spec-1.1.1/target/geronimo-ws-metadata_2.0_spec-1.1.1.jar \
-  %{buildroot}%{_javadir}/geronimo-ws-metadata-2.0-api.jar
-%{mvn_install_pom} geronimo-ws-metadata_2.0_spec-1.1.1/pom.xml \
-  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-ws-metadata-2.0-api.pom
-%add_maven_depmap JPP-geronimo-ws-metadata-2.0-api.pom geronimo-ws-metadata-2.0-api.jar -f ws-metadata-2.0-api
-
 %pre -n geronimo-jaf-1_0_2-api
 update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar
 update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar
@@ -580,10 +470,6 @@ update-alternatives --remove jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar
 update-alternatives --remove annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar
 update-alternatives --remove annotation_1_0_api %{_javadir}/geronimo-annotation-1.0-api.jar
 
-%pre -n geronimo-el-1_0-api
-update-alternatives --remove el_api %{_javadir}/geronimo-el-1.0-api.jar
-update-alternatives --remove el_1_0_api %{_javadir}/geronimo-el-1.0-api.jar
-
 %pre -n geronimo-javamail-1_3_1-api
 update-alternatives --remove javamail_api %{_javadir}/geronimo-javamail-1.3.1-api.jar
 update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-javamail-1.3.1-api.jar
@@ -611,16 +497,6 @@ update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar
 update-alternatives --remove jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar
 update-alternatives --remove jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar
 
-%pre -n geronimo-jsp-2_0-api
-update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.0-api.jar
-update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.0-api.jar
-update-alternatives --remove jsp_2_0_api %{_javadir}/geronimo-jsp-2.0-api.jar
-
-%pre -n geronimo-jsp-2_1-api
-update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.1-api.jar
-update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.1-api.jar
-update-alternatives --remove jsp_2_1_api %{_javadir}/geronimo-jsp-2.1-api.jar
-
 %pre -n geronimo-jta-1_0_1B-api
 update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar
 update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar
@@ -650,14 +526,6 @@ update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.5-api.jar
 update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar
 update-alternatives --remove servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar
 
-%pre -n geronimo-stax-1_0-api
-update-alternatives --remove stax_api %{_javadir}/geronimo-stax-1.0-api.jar
-update-alternatives --remove stax_1_0_api %{_javadir}/geronimo-stax-1.0-api.jar
-
-%pre -n geronimo-ws-metadata-2_0-api
-update-alternatives --remove ws_metadata_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar
-update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar
-
 %files -n geronimo-jaf-1_0_2-api -f .mfiles-jaf-1.0.2-api
 %license geronimo-activation_1.0.2_spec-1.2/LICENSE.txt
 
@@ -667,9 +535,6 @@ update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadat
 %files -n geronimo-annotation-1_0-api -f .mfiles-annotation-1.0-api
 %license geronimo-annotation_1.0_spec-1.1.0/LICENSE.txt
 
-%files -n geronimo-el-1_0-api -f .mfiles-el-1.0-api
-%license geronimo-el_1.0_spec-1.0/LICENSE.txt
-
 %files -n geronimo-javamail-1_3_1-api -f .mfiles-javamail-1.3.1-api
 %license geronimo-javamail_1.3.1_spec-1.3/LICENSE.txt
 
@@ -688,12 +553,6 @@ update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadat
 %files -n geronimo-jpa-3_0-api -f .mfiles-jpa-3.0-api
 %license geronimo-jpa_3.0_spec-1.1.0/LICENSE.txt
 
-%files -n geronimo-jsp-2_0-api -f .mfiles-jsp-2.0-api
-%license geronimo-jsp_2.0_spec-1.1/LICENSE.txt
-
-%files -n geronimo-jsp-2_1-api -f .mfiles-jsp-2.1-api
-%license geronimo-jsp_2.1_spec-1.0/LICENSE.txt
-
 %files -n geronimo-jta-1_0_1B-api -f .mfiles-jta-1.0.1B-api
 %license geronimo-jta_1.0.1B_spec-1.1.1/LICENSE.txt
 
@@ -712,10 +571,4 @@ update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadat
 %files -n geronimo-servlet-2_5-api -f .mfiles-servlet-2.5-api
 %license geronimo-servlet_2.5_spec-1.1/LICENSE.txt
 
-%files -n geronimo-stax-1_0-api -f .mfiles-stax-1.0-api
-%license geronimo-stax-api_1.0_spec-1.0/LICENSE.txt
-
-%files -n geronimo-ws-metadata-2_0-api -f .mfiles-ws-metadata-2.0-api
-%license geronimo-ws-metadata_2.0_spec-1.1.1/LICENSE.txt
-
 %changelog