diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/feature.xml
index 1e9803d..c24a357 100644
--- a/features/org.eclipse.jst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -21,50 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.204" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.100" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.204" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.204" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.ui" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.tomcat.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.304" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.305" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.ui" version="1.0.303" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.core" version="1.0.205" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.ui" version="1.0.205" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.1.101" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.ui" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.ui" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.jst.server.preview.adapter"
          download-size="0"
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index b68dff2..e7323d6 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -21,29 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
-   <includes
-         id="org.eclipse.jst.common_core.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.304" match="compatible"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.jst.server.core"
          download-size="0"
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index 0d345f6..af078a4 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -29,33 +29,6 @@
          id="org.eclipse.jst.server_core.feature"
          version="0.0.0"/>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.junit" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.100" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.103" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.core" version="1.0.1" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.jst.server.ui"
          download-size="0"