diff --git a/dist/popnhax/popnhax.xml b/dist/popnhax/popnhax.xml
index fbf369b..c07a08b 100644
--- a/dist/popnhax/popnhax.xml
+++ b/dist/popnhax/popnhax.xml
@@ -42,6 +42,8 @@
     <!-- Press numpad 9 in song to retire instantly, or on result screen to leave game session (thank you for playing) -->
     <!-- quick_retire with pfree also enables quick retry: press numpad 8 during song or on result screen to retry (keep holding to skip option select) -->
     <quick_retire __type="bool">0</quick_retire>
+    <!-- Press 9 on option select screen to go back to song selection (requires quick_retire) -->
+    <back_to_song_select __type="bool">0</back_to_song_select>
 
   <!-- Audio offset -->
     <!-- Offset the audio by x ms (negative plays audio earlier). This will disable keysounds -->
@@ -98,9 +100,6 @@
     <!-- Enable practice mode menu, (r-ran, constant chart speed, slow motion, etc...) -->
     <!-- PLEASE USE OFFLINE ONLY -->
     <practice_mode __type="bool">0</practice_mode>
-    <!-- Press 9 on option select screen to go back to song selection (requires quick_retire) -->
-    <back_to_song_select __type="bool">0</back_to_song_select>
-
 
   <!-- ========================================================================================
        DEBUG OPTIONS FOLLOW (GENERALLY SHOULD NOT BE CHANGED UNLESS YOU KNOW WHAT YOU'RE DOING)
@@ -145,10 +144,6 @@
     <patch_xml_auto __type="bool">1</patch_xml_auto>
     <!-- Manually set XML file containing patches (requires patch_xml_auto to be disabled) -->
     <patch_xml_filename __type="str"></patch_xml_filename>
-    <!-- Force the newly created buffers to be the same size as the original buffers (not recommended) -->
-    <disable_expansions __type="bool">0</disable_expansions>
-    <!-- Copy the new table information over top the old tables (automatically enables disable_expansions) (not recommended) -->
-    <disable_redirection __type="bool">0</disable_redirection>
     <!-- Do not perform music limit checks for patch_xml_auto (not recommended) -->
     <ignore_music_limit __type="bool">0</ignore_music_limit>
 
@@ -171,15 +166,5 @@
   <!-- Translation -->
     <!-- Disable .dict string replacements and .ips patches -->
     <disable_translation __type="bool">0</disable_translation>
-    <!-- Dump applied translations and dll runtime data to help debug translation -->
-    <translation_debug __type="bool">0</translation_debug>
-
-  <!-- HARD Gauge alteration modes -->
-    <!-- Turn hard gauge into survival gauge (1: former COURSE gauge (-3.42%), 2: NORMAL gauge decrease rate (-4.99%), 3: IIDX HARD gauge decrease rate (-9%), 4: HARD gauge decrease rate (-19.94%)) -->
-    <survival_gauge __type="u8">0</survival_gauge>
-    <!-- Survival gauge has IIDX-like decrease rate adjustment (decrease amount halved when gauge is at 30% or less) -->
-    <survival_iidx __type="bool">0</survival_iidx>
-    <!-- Set survival gauge increase rate to spicy (+01/+01 instead of +02/+01) -->
-    <survival_spicy __type="bool">0</survival_spicy>
 
 </popnhax>
diff --git a/popnhax/dllmain.cc b/popnhax/dllmain.cc
index 05d5d41..6d1f07b 100644
--- a/popnhax/dllmain.cc
+++ b/popnhax/dllmain.cc
@@ -96,12 +96,6 @@ PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, hidden_is_offs
                  "/popnhax/hidden_is_offset")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, iidx_hard_gauge,
                  "/popnhax/iidx_hard_gauge")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_U8, struct popnhax_config, survival_gauge,
-                 "/popnhax/survival_gauge")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, survival_iidx,
-                 "/popnhax/survival_iidx")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, survival_spicy,
-                 "/popnhax/survival_spicy")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, show_fast_slow,
                  "/popnhax/show_fast_slow")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, show_details,
@@ -142,10 +136,6 @@ PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, guidese_off,
                  "/popnhax/guidese_off")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, patch_db,
                  "/popnhax/patch_db")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_expansions,
-                 "/popnhax/disable_expansions")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_redirection,
-                 "/popnhax/disable_redirection")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_multiboot,
                  "/popnhax/disable_multiboot")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, patch_xml_auto,
@@ -170,8 +160,6 @@ PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, fps_uncap,
                  "/popnhax/fps_uncap")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_translation,
                  "/popnhax/disable_translation")
-PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, translation_debug,
-                 "/popnhax/translation_debug")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, enhanced_polling,
                  "/popnhax/enhanced_polling")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_U8, struct popnhax_config, debounce,
@@ -216,6 +204,19 @@ PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, high_framerate
                  "/popnhax/high_framerate_limiter")
 PSMAP_MEMBER_REQ(PSMAP_PROPERTY_TYPE_U16, struct popnhax_config, high_framerate_fps,
                  "/popnhax/high_framerate_fps")
+/* removed options are now hidden as optional */
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_U8, struct popnhax_config, survival_gauge,
+                 "/popnhax/survival_gauge", 0)
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, survival_iidx,
+                 "/popnhax/survival_iidx", false)
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, survival_spicy,
+                 "/popnhax/survival_spicy", false)
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_expansions,
+                 "/popnhax/disable_expansions", false)
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, disable_redirection,
+                 "/popnhax/disable_redirection", false)
+PSMAP_MEMBER_OPT(PSMAP_PROPERTY_TYPE_BOOL, struct popnhax_config, translation_debug,
+                 "/popnhax/translation_debug", false)
 PSMAP_END
 
 enum BufferIndexes {