diff --git a/cave/com.raytheon.viz.text.feature/feature.xml b/cave/com.raytheon.viz.text.feature/feature.xml
index a455507f1a..d1fbd0dd9b 100644
--- a/cave/com.raytheon.viz.text.feature/feature.xml
+++ b/cave/com.raytheon.viz.text.feature/feature.xml
@@ -22,6 +22,7 @@
       <import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.viz.radar.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.edex.archive.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin
@@ -38,20 +39,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.edex.maintenance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-   <plugin
-         id="com.raytheon.edex.plugin.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.viz.texteditor"
          download-size="0"
diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 10cf4d77d2..b7008a00bf 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -50,6 +50,10 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.grib.feature" />
 		</antcall>
+        <antcall target="build">
+            <param name="feature"
+                value="com.raytheon.uf.edex.archive.feature" />
+        </antcall>
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.text.feature" />
@@ -102,10 +106,6 @@
             <param name="feature"
                 value="com.raytheon.uf.edex.datadelivery.feature" />
         </antcall>
-        <antcall target="build">
-            <param name="feature"
-                value="com.raytheon.uf.edex.archive.feature" />
-        </antcall>
 
 		<!-- SPECIAL CASE -->
 		<if>
diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
index 22c3c97dc2..354e29525a 100644
--- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
+++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
@@ -68,6 +68,10 @@
          id="com.raytheon.uf.edex.grib.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.edex.archive.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.edex.text.feature"
          version="0.0.0"/>
@@ -124,8 +128,4 @@
          id="com.raytheon.uf.edex.registry.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.edex.archive.feature"
-         version="0.0.0"/>
-
 </feature>