diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
index 69fc7f87bc..68eee5364b 100644
--- a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
@@ -57,10 +57,6 @@
     <contribute xsi:type="bundleItem" file="bundles/tools/Home.xml"
 		menuText="Home" id="homeTool" timeQuery="false" />
     
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.lapstools"
-		menuText="LAPS tools..." id="lapsTools" />
-    
     <contribute xsi:type="bundleItem" file="bundles/tools/Points.xml"
 		menuText="Points" id="pointsTool" timeQuery="false" />
     
@@ -105,4 +101,4 @@
 	</contribute>
 	-->
 	
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.viz.awipstools/plugin.xml b/cave/com.raytheon.viz.awipstools/plugin.xml
index 7bbcb72dcf..5749a33bc3 100644
--- a/cave/com.raytheon.viz.awipstools/plugin.xml
+++ b/cave/com.raytheon.viz.awipstools/plugin.xml
@@ -70,10 +70,6 @@
      <command
           id="com.raytheon.viz.awipstools.home"
           name="Home">
-    </command>
-    <command
-          id="com.raytheon.viz.awipstools.lapstools"
-          name="LAPS tools">
     </command>
      <command
           id="com.raytheon.viz.awipstools.unitscalculator"
@@ -207,37 +203,4 @@
             commandId="com.raytheon.viz.awipstools.arbitrary">
       </handler>
    </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-       <menuContribution
-            locationURI="toolbar:d2d-2?after=tools.toolbar">
-            <command
-                  commandId="com.raytheon.uf.viz.ui.loadbundle"
-                  icon="icons/points.gif"
-                  label="Points">
-				<visibleWhen>
-                   <reference
-                         definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
-                   </reference>
-                </visibleWhen>
-			    <parameter
-			          name="bundleFile"
-			          value="bundles/tools/Points.xml">
-			    </parameter>
-            </command>
-            <command
-                  commandId="com.raytheon.uf.viz.ui.loadbundle"
-                  icon="icons/Baseline.gif"
-                  label="Baselines">
-				<visibleWhen>
-                   <reference
-                         definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
-                   </reference>
-                </visibleWhen>
-			    <parameter
-			          name="bundleFile"
-			          value="bundles/tools/Baselines.xml" />
-            </command>
-       </menuContribution>
-   </extension>
 </plugin>
diff --git a/cave/com.raytheon.viz.warngen/plugin.xml b/cave/com.raytheon.viz.warngen/plugin.xml
index e5263ce2ae..b453085af4 100644
--- a/cave/com.raytheon.viz.warngen/plugin.xml
+++ b/cave/com.raytheon.viz.warngen/plugin.xml
@@ -53,7 +53,6 @@
 				id="plugins">
 				<command
 					commandId="com.raytheon.viz.warngen.gui.WarngenAction"
-					icon="icons/warngen.gif"
 					label="Warngen">
 					<visibleWhen>
 					    <and>