diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index ff400e19e8..371105cc7a 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -329,10 +329,6 @@
             <param name="feature"
                     value="com.raytheon.uf.viz.acarssounding.feature" />
         </antcall>
-        <antcall target="p2.build.repo">
-            <param name="feature"
-                    value="com.raytheon.viz.avnfps.feature" />
-        </antcall>
         <antcall target="p2.build.repo">
             <param name="feature"
                     value="com.raytheon.uf.viz.dat.feature" />
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index ba6ebd7331..37059448b2 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -603,8 +603,13 @@
                   </reference>
                </visibleWhen>
             </command>
-
-
+			<command
+                  commandId="com.raytheon.uf.viz.productbrowser.productBrowser"
+				  icon="icons/plus.png"
+                  label="Browser"
+				  mode="FORCE_TEXT"
+                  style="push">
+            </command>
          </toolbar>
          </menuContribution>
          <menuContribution
diff --git a/cave/com.raytheon.uf.viz.dat.feature/feature.xml b/cave/com.raytheon.uf.viz.dat.feature/feature.xml
index 7e473721cb..28ddac4dcc 100644
--- a/cave/com.raytheon.uf.viz.dat.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dat.feature/feature.xml
@@ -30,7 +30,6 @@
       <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.d2d.core.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.displays.feature" version="1.0.0.qualifier"/>
-      <import feature="com.raytheon.viz.avnfps.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.viz.satellite.feature" version="1.0.0.qualifier"/>
    </requires>
 
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 28425ca5c1..6a0df99611 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -77,10 +77,6 @@
          id="com.raytheon.viz.grib.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.viz.gfe.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.displays.feature"
          version="0.0.0"/>
@@ -153,26 +149,10 @@
          id="com.raytheon.uf.viz.acarssounding.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.viz.avnfps.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.dat.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.d2d.gfe.feature"
-         version="0.0.0"/>
-	<!--
-   <includes
-         id="com.raytheon.uf.viz.collaboration.feature"
-         version="0.0.0"/>
-		 
-	<includes
-         id="com.raytheon.uf.viz.useradmin.feature"
-         version="0.0.0"/>
-	-->
    <includes
          id="com.raytheon.uf.viz.gisdatastore.feature"
          version="0.0.0"/>
diff --git a/cave/com.raytheon.viz.grid/localization/menus/mrms/index.xml b/cave/com.raytheon.viz.grid/localization/menus/mrms/index.xml
deleted file mode 100644
index 5dc174e36c..0000000000
--- a/cave/com.raytheon.viz.grid/localization/menus/mrms/index.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-     Name				Organization			Date				Info
-     Darrel Kingfield	NOAA/NSSL/CIMMS 		09-02-2014			Initial File Creation
-    -->
-<menuContributionFile>
-	<include installTo="menu:mrms?after=MRMS_MENU_START"
-			 fileName="menus/mrms/mrms.xml">
-	</include>
-</menuContributionFile>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml b/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml
index 75b23ba6b8..b6ede41a0b 100644
--- a/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml
+++ b/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml
@@ -5,6 +5,5 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<!-- Set the initial top level menu -->
-	<contribute xsi:type="titleItem" titleText="---Multiple-Radar/Multiple-Sensor---" id="MRMS-SVR"/>
 	<contribute xsi:type="subinclude" fileName="menus/mrms/mrmsProducts.xml"/>
 </menuTemplate>
diff --git a/cave/com.raytheon.viz.grid/plugin.xml b/cave/com.raytheon.viz.grid/plugin.xml
index a680a122ca..d8408db76f 100644
--- a/cave/com.raytheon.viz.grid/plugin.xml
+++ b/cave/com.raytheon.viz.grid/plugin.xml
@@ -65,8 +65,6 @@
                        definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
                  </reference>
               </visibleWhen>
-
-              <separator name="MRMS_MENU_START" visible="false"/>
            </menu>
         </menuContribution>
      </extension>
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
index fa9336ad41..e42cf7671f 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
@@ -15,6 +15,10 @@
 		id="RadarMenuTwdrRadarsSubMenu">
 		<contribute xsi:type="subinclude" fileName="menus/radar/tdwrRadars.xml" />
 	</contribute>
+	<contribute xsi:type="subMenu" menuText="MRMS"
+                id="RadarMenuMRMSSubMenu">
+				<contribute xsi:type="subinclude" fileName="menus/mrms/mrmsProducts.xml"/>
+        </contribute>
 	<contribute xsi:type="titleItem" titleText="------ FNEXRAD Composites ------"
 		id="RadarMosaic" />
 	<!--  Unidata Composite -->