diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 65501bab81..6085a65a80 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3681,17 +3681,6 @@
       <integer>0</integer>
     </map>
   <key>DebugAvatarAppearanceMessage</key>
-  <map>
-    <key>Comment</key>
-    <string>Dump a bunch of XML files when handling appearance messages</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>DebugAvatarAppearanceMessage</key>
   <map>
     <key>Comment</key>
     <string>Dump a bunch of XML files when handling appearance messages</string>
@@ -3729,17 +3718,6 @@
     <integer>0</integer>
   </map>
   <key>DebugAvatarCompositeBaked</key>
-  <map>
-    <key>Comment</key>
-    <string>Colorize avatar meshes based on baked/composite state.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>DebugAvatarCompositeBaked</key>
   <map>
     <key>Comment</key>
     <string>Colorize avatar meshes based on baked/composite state.</string>
@@ -11306,28 +11284,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>DisableAllRenderTypes</key>
-    <map>
-      <key>Comment</key>
-      <string>Disables all rendering types.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DisableAllRenderFeatures</key>
-    <map>
-      <key>Comment</key>
-      <string>Disables all rendering features.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>RenderHUDInSnapshot</key>
     <map>
       <key>Comment</key>
@@ -12596,50 +12552,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>NearbyListShowMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Show/hide map above nearby people list</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>NearbyListShowMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Show/hide map above nearby people list</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>NearbyListShowMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Show/hide map above nearby people list</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>NearbyListShowMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Show/hide map above nearby people list</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>NearbyListShowIcons</key>
     <map>
       <key>Comment</key>
@@ -15697,17 +15609,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Backup</key>
       <integer>0</integer>
     </map>
-    <key>VerifyInitialWearables</key>
-    <map>
-      <key>Comment</key>
-      <string>Compares the initial wearables to the COF contents to determine which one to use for the intial outfit</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <boolean>0</boolean>
-    </map>
     <key>VertexShaderEnable</key>
     <map>
       <key>Comment</key>
@@ -16338,28 +16239,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>-1.0</integer>
     </map>
-    <key>MaxFPS</key>
-    <map>
-      <key>Comment</key>
-      <string>Yield some time to the local host if we reach a threshold framerate.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <integer>-1.0</integer>
-    </map>
-    <key>ForcePeriodicRenderingTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Periodically enable all rendering masks for a single frame.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <integer>-1.0</integer>
-    </map>
     <key>ZoomDirect</key>
     <map>
       <key>Comment</key>