diff --git a/features/org.eclipse.datatools.connectivity.feature/feature.xml b/features/org.eclipse.datatools.connectivity.feature/feature.xml
index 27764fb..52d6dc6 100644
--- a/features/org.eclipse.datatools.connectivity.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.feature/feature.xml
@@ -19,21 +19,6 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.datatools.connectivity.oda.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.connectivity.oda.designer.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.connectivity.oda.designer.core.feature"
-         version="0.0.0"
-         optional="true"/>
-
    <requires>
       <import feature="org.eclipse.datatools.modelbase.feature" version="1.13.0" match="greaterOrEqual"/>
    </requires>
diff --git a/features/org.eclipse.datatools.enablement.feature/feature.xml b/features/org.eclipse.datatools.enablement.feature/feature.xml
index 28e7a4d..5c388c3 100644
--- a/features/org.eclipse.datatools.enablement.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.feature/feature.xml
@@ -19,81 +19,6 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.datatools.enablement.apache.derby.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.hsqldb.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.ibm.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.jdbc.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.jdt.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.msft.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.mysql.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.oda.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.oda.designer.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.oracle.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.postgresql.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.sap.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.sybase.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.ingres.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.enablement.sqlite.feature"
-         version="0.0.0"
-         optional="true"/>
-
    <requires>
       <import feature="org.eclipse.datatools.modelbase.feature" version="1.13.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.datatools.connectivity.feature" version="1.13.0" match="greaterOrEqual"/>
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
index b24211d..f01e66f 100644
--- a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
@@ -27,31 +27,6 @@
          id="org.eclipse.datatools.sqldevtools.ddlgen.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.datatools.sqldevtools.ddl.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.sqldevtools.data.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.sqldevtools.parsers.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature"
-         version="0.0.0"
-         optional="true"/>
-
    <requires>
       <import feature="org.eclipse.gef" version="3.4.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.datatools.modelbase.feature" version="1.13.0" match="greaterOrEqual"/>