diff --git a/features/features.xml b/features/features.xml
index d4d37ff..bf7e17c 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -97,14 +97,6 @@
         <bundle>mvn:org.onosproject/onlab-netty/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-core-trivial" version="@FEATURE-VERSION"
-             description="ONOS core components">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-trivial/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-rest" version="@FEATURE-VERSION"
              description="ONOS REST API components">
         <feature>onos-api</feature>
@@ -128,11 +120,7 @@
         <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-null" version="@FEATURE-VERSION"
-             description="ONOS Null providers">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-null-provider/@ONOS-VERSION</bundle>
-    </feature>
+    <!-- ONOS OpenFlow provider app features -->
 
     <feature name="onos-openflow" version="@FEATURE-VERSION"
              description="ONOS OpenFlow API, Controller &amp; Providers">
@@ -151,146 +139,14 @@
         <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- ONOS built-in app features -->
+    <!-- Deprecated! For standalone testing only. -->
 
-    <feature name="onos-app-fwd" version="@FEATURE-VERSION"
-             description="ONOS sample forwarding application">
+    <feature name="onos-core-trivial" version="@FEATURE-VERSION"
+             description="ONOS core components">
         <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-fwd/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-core-trivial/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-mobility" version="@FEATURE-VERSION"
-             description="ONOS sample mobility application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-mobility/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-proxyarp" version="@FEATURE-VERSION"
-             description="ONOS sample proxyarp application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-proxyarp/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-config" version="@FEATURE-VERSION"
-             description="ONOS network config reader">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-config/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-optical" version="@FEATURE-VERSION"
-             description="ONOS optical network config">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-optical/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-reactive-routing" version="@FEATURE-VERSION"
-             description="ONOS SDN/IP reactive routing">
-        <feature>onos-app-sdnip</feature>
-        <bundle>mvn:org.onosproject/onos-app-reactive-routing/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-sdnip" version="@FEATURE-VERSION"
-             description="SDN-IP peering application">
-        <feature>onos-api</feature>
-        <feature>onos-app-proxyarp</feature>
-        <feature>onos-app-config</feature>
-        <bundle>mvn:org.onosproject/onos-app-sdnip/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-bgprouter" version="@FEATURE-VERSION"
-             description="BGP router application">
-        <feature>onos-api</feature>
-        <feature>onos-app-proxyarp</feature>
-        <feature>onos-app-config</feature>
-        <bundle>mvn:org.onosproject/onos-app-bgprouter/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-metrics" version="@FEATURE-VERSION"
-             description="ONOS metrics applications">
-        <feature>onos-app-metrics-intent</feature>
-        <feature>onos-app-metrics-topology</feature>
-    </feature>
-
-    <feature name="onos-app-metrics-intent" version="@FEATURE-VERSION"
-             description="ONOS intent metrics application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-metrics-intent/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-metrics-topology" version="@FEATURE-VERSION"
-             description="ONOS topology metrics application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle>
-    </feature>
-
-
-    <!-- ONOS test app features -->
-
-    <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
-             description="ONOS intent perf applications">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-election" version="@FEATURE-VERSION"
-             description="ONOS app leadership election test">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-demo" version="@FEATURE-VERSION"
-             description="ONOS demo applications">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
-    </feature>
-
-
-    <!-- ONOS sample app features: to be moved to a different repo -->
-
-    <feature name="onos-app-tvue" version="@FEATURE-VERSION"
-             description="ONOS sample topology viewer application">
-        <feature>onos-api</feature>
-        <feature>onos-thirdparty-web</feature>
-        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-ifwd" version="@FEATURE-VERSION"
-             description="ONOS sample forwarding application using intents">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-ifwd/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-database-perf" version="@FEATURE-VERSION"
-             description="ONOS partitioned database perf application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-database-perf/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-calendar" version="@FEATURE-VERSION"
-             description="REST interface for scheduling intents from an external calendar">
-        <feature>onos-api</feature>
-        <feature>onos-thirdparty-web</feature>
-        <bundle>mvn:org.onosproject/onos-app-calendar/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-grouphandler" version="@FEATURE-VERSION"
-             description="Group Handler Sample App">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-grouphandler/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-segmentrouting" version="@FEATURE-VERSION"
-             description="Segment routing application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-segmentrouting/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-grouphandler/@ONOS-VERSION</bundle>
-    </feature>
-
-
 </features>