diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ca92cad480..b74adcfd20 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1694,187 +1694,6 @@
         </menu_item_call>
     </menu>
     
-    <menu
-     create_jump_keys="true"
-     label="RLVa"
-     name="RLVa Main"
-     tear_off="true"
-     visible="true">
-      <menu
-       label="Debug"
-       name="Debug"
-       tear_off="true">
-        <menu_item_check
-         label="Show Top-level RLVa Menu"
-         name="Show Top-level RLVa Menu">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaTopLevelMenu" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaTopLevelMenu" />
-        </menu_item_check>
-      	<menu_item_separator/>
-      	<menu_item_check
-      	 label="Show Debug Messages"
-      	 name="Show Debug Messages">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RestrainedLoveDebug" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RestrainedLoveDebug" />
-      	</menu_item_check>
-      	<menu_item_check
-      	 label="Hide Unset or Duplicate Messages"
-      	 name="Hide Unset or Duplicate Messages">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaDebugHideUnsetDuplicate" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaDebugHideUnsetDuplicate" />
-      	</menu_item_check>
-      	<menu_item_check
-      	 label="Show Assertion Failures"
-      	 name="Show Assertion Failures">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaShowAssertionFailures" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaShowAssertionFailures" />
-      	</menu_item_check>
-      	<menu_item_separator/>
-      	<menu_item_check
-      	 label="Enable Legacy Naming"
-      	 name="Enable Legacy Naming">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaEnableLegacyNaming" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaEnableLegacyNaming" />
-      	</menu_item_check>
-        <menu_item_check
-      	 label="Enable Shared Wear"
-      	 name="Enable Shared Wear">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaEnableSharedWear" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaEnableSharedWear" />
-        </menu_item_check>
-        <menu_item_check
-      	 label="Rename Shared Items on Wear"
-      	 name="Rename Shared Items on Wear">
-          <menu_item_check.on_check
-           function="CheckControl"
-           parameter="RLVaSharedInvAutoRename" />
-          <menu_item_check.on_click
-           function="ToggleControl"
-           parameter="RLVaSharedInvAutoRename" />
-      	</menu_item_check>
-      	<menu_item_separator/>
-      	<menu_item_check
-      	 label="Locks..."
-      	 name="Locks">
-          <menu_item_check.on_check
-           function="Floater.Visible"
-           parameter="rlv_locks" />
-          <menu_item_check.on_click
-           function="Floater.Toggle"
-           parameter="rlv_locks" />
-      	</menu_item_check>
-      </menu>
-      <menu_item_separator/>
-      <menu_item_check
-       label="Hide Locked Layers"
-       name="Hide Locked Layers">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RLVaHideLockedLayers" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RLVaHideLockedLayers" />
-      </menu_item_check>
-      <menu_item_check
-       label="Hide Locked Attachments"
-       name="Hide Locked Attachments">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RLVaHideLockedAttachments" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RLVaHideLockedAttachments" />
-      </menu_item_check>
-      <menu_item_separator/>
-      <menu_item_check
-       label="Allow OOC Chat"
-       name="Allow OOC Chat">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RestrainedLoveCanOOC" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RestrainedLoveCanOOC" />
-      </menu_item_check>
-      <menu_item_check
-       label="Forbid Give to #RLV"
-       name="Forbid Give to #RLV">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RestrainedLoveForbidGiveToRLV" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RestrainedLoveForbidGiveToRLV" />
-      </menu_item_check>
-      <menu_item_check
-       label="Show Filtered Chat"
-       name="Show Filtered Chat">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RestrainedLoveShowEllipsis" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RestrainedLoveShowEllipsis" />
-      </menu_item_check>
-      <menu_item_check
-       label="Show Name Tags"
-       name="Show Name Tags">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RLVaShowNameTags" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RLVaShowNameTags" />
-      </menu_item_check>
-      <menu_item_check
-       label="Wear Replaces Unlocked"
-       name="Wear Replaces Unlocked">
-      	<menu_item_check.on_check
-      	 function="CheckControl"
-      	 parameter="RLVaWearReplaceUnlocked" />
-      	<menu_item_check.on_click
-      	 function="ToggleControl"
-      	 parameter="RLVaWearReplaceUnlocked" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu_item_check
-       label="Restrictions..."
-       name="Restrictions">
-      	<menu_item_check.on_check
-      	 function="Floater.Visible"
-      	 parameter="rlv_behaviours" />
-      	<menu_item_check.on_click
-      	 function="Floater.Toggle"
-      	 parameter="rlv_behaviours" />
-      </menu_item_check>
-    </menu>
-
-	
-    <!-- Advanced Menu -->
     <menu
      create_jump_keys="true"
      label="RLVa"
@@ -2053,6 +1872,8 @@
       	 parameter="rlv_behaviours" />
       </menu_item_check>
     </menu>
+
+    <!-- Advanced Menu -->
     <menu
      create_jump_keys="true"
      label="Advanced"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3fb264f943..ce5a42536f 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -133,7 +133,6 @@ Looking for people to hang out with? Use the search box to find topics or conten
 			
 			<layout_stack orientation="vertical" clip="true" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false" name="radar_ls" auto_resize="false">
 			<layout_panel layout="topleft" top="0" left="3" height="140" width="307" max_height="140"  follows="top" mouse_opaque="false" visibility_control="ShowRadarMinimap" name="minimaplayout" auto_resize="false">
-             name="Net Map Panel"
              <net_map
              bg_color="NetMapBackgroundColor"
              visibility_control="ShowRadarMinimap"