diff --git a/src/presets/100map_data.asm b/src/presets/100map_data.asm
index eb46f2250..29bb68be3 100644
--- a/src/presets/100map_data.asm
+++ b/src/presets/100map_data.asm
@@ -4497,7 +4497,6 @@ preset_100map_greenpink_brin_cleanup_green_hill_zone_final:
     dw $09C2, $006B  ; Health
     dw $09C6, $0008  ; Missiles
     dw $09CA, $000B  ; Supers
-    dw $09CE, $0003  ; Pbs
     dw $0A1C, $0001  ; Samus position/state
     dw $0A1E, $0008  ; More position/state
     dw $0AF6, $035E  ; Samus X
@@ -4538,7 +4537,6 @@ preset_100map_blue_brinstar_cleanup_blue_brinstar_etank_room:
     dw $0919, $0000  ; Layer 2 Y position
     dw $09C2, $0069  ; Health
     dw $09C6, $0003  ; Missiles
-    dw $09CE, $0003  ; Pbs
     dw $09D2, $0000  ; Currently selected item
     dw $0AF6, $00D8  ; Samus X
     dw $CAE8, $0460  ; Map counter
@@ -4970,7 +4968,6 @@ preset_100map_tourian_baby_skip:
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $1000  ; Screen subpixel Y position
     dw $0917, $00C0  ; Layer 2 X position
-    dw $09C2, $031F  ; Health
     dw $09CA, $000D  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
diff --git a/src/presets/14ice_data.asm b/src/presets/14ice_data.asm
index 4bcdec31e..d7f7ee807 100644
--- a/src/presets/14ice_data.asm
+++ b/src/presets/14ice_data.asm
@@ -374,9 +374,7 @@ preset_14ice_brinstar_big_pink:
     dw $090F, $7000  ; Screen subpixel X position
     dw $0911, $0600  ; Screen X position in pixels
     dw $0913, $9400  ; Screen subpixel Y position
-    dw $0915, $0000  ; Screen Y position in pixels
     dw $0917, $0480  ; Layer 2 X position
-    dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0000  ; Missiles
     dw $09CA, $0004  ; Supers
     dw $09CC, $0005  ; Max supers
diff --git a/src/presets/14speed_data.asm b/src/presets/14speed_data.asm
index 30f0e1531..3aa9ae6b7 100644
--- a/src/presets/14speed_data.asm
+++ b/src/presets/14speed_data.asm
@@ -374,9 +374,7 @@ preset_14speed_brinstar_big_pink:
     dw $090F, $7000  ; Screen subpixel X position
     dw $0911, $0600  ; Screen X position in pixels
     dw $0913, $9400  ; Screen subpixel Y position
-    dw $0915, $0000  ; Screen Y position in pixels
     dw $0917, $0480  ; Layer 2 X position
-    dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0000  ; Missiles
     dw $09CA, $0004  ; Supers
     dw $09CC, $0005  ; Max supers
diff --git a/src/presets/combined_preset_data.asm b/src/presets/combined_preset_data.asm
index 98760bbcc..04720250a 100644
--- a/src/presets/combined_preset_data.asm
+++ b/src/presets/combined_preset_data.asm
@@ -4704,7 +4704,7 @@ preset_kpdr22_kraid_kraid_kihunters:
     dw $079B, $A471  ; MDB
     dw $0913, $8000  ; Screen subpixel Y position
     dw $0919, $0100  ; Layer 2 Y position
-    dw $09D2, $0002  ; Currently selected item
+    dw $09CA, $0002  ; Supers
     dw $0AF6, $0167  ; Samus X
     dw $0AF8, $B000  ; Samus subpixel X
     dw #$FFFF
@@ -5450,7 +5450,7 @@ preset_kpdr25_kraid_kraid_kihunters:
     dw $09A6, $1004  ; Equipped Beams
     dw $09A8, $1004  ; Collected Beams
     dw $09C6, $0007  ; Missiles
-    dw $09CA, $0004  ; Supers
+    dw $09CA, $0003  ; Supers
     dw $D874, $0404  ; Items
     dw $D8B6, $8008  ; Doors
     dw #$FFFF
@@ -6284,7 +6284,7 @@ preset_kpdr25_kraid_minikraid:
     dw $09A6, $1004  ; Equipped Beams
     dw $09A8, $1004  ; Collected Beams
     dw $09C6, $0007  ; Missiles
-    dw $09CA, $0004  ; Supers
+    dw $09CA, $0003  ; Supers
     dw $D874, $0404  ; Items
     dw $D8B6, $8008  ; Doors
     dw #$FFFF
diff --git a/src/presets/kpdr20_data.asm b/src/presets/kpdr20_data.asm
index 11c2f33fa..5c3784f2f 100644
--- a/src/presets/kpdr20_data.asm
+++ b/src/presets/kpdr20_data.asm
@@ -491,10 +491,8 @@ preset_kpdr20_brinstar_passing_through_maridia:
     dw $078D, $9132  ; DDB
     dw $079B, $A408  ; MDB
     dw $090F, $8000  ; Screen subpixel X position
-    dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $CC00  ; Screen subpixel Y position
     dw $0915, $0100  ; Screen Y position in pixels
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C0  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0005  ; Supers
@@ -512,7 +510,6 @@ preset_kpdr20_kraid_entering_kraids_lair:
     dw $0919, $0100  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
     dw $0AF6, $002E  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr20_kraid_warehouse_zeelas:
@@ -534,13 +531,14 @@ preset_kpdr20_kraid_warehouse_zeelas:
     dw #$FFFF
 
 preset_kpdr20_kraid_kraid_kihunters:
-    dw #preset_kpdr20_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
+    dw #preset_kpdr20_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
     dw $078D, $923A  ; DDB
     dw $079B, $A471  ; MDB
     dw $07F5, $0005  ; Music Track
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $8000  ; Screen subpixel Y position
+    dw $0915, $0100  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $0AF6, $0167  ; Samus X
@@ -642,14 +640,10 @@ preset_kpdr20_kraid_minikraid_revisit:
     dw $079B, $A56B  ; MDB
     dw $090F, $3000  ; Screen subpixel X position
     dw $0913, $7800  ; Screen subpixel Y position
-    dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $007C  ; Health
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0058  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr20_kraid_kraid_kihunters_revisit:
@@ -691,13 +685,11 @@ preset_kpdr20_kraid_business_center_preelev:
     dw $090F, $3000  ; Screen subpixel X position
     dw $0911, $0006  ; Screen X position in pixels
     dw $0913, $0000  ; Screen subpixel Y position
-    dw $0917, $0006  ; Layer 2 X position
     dw $0915, $0000  ; Screen Y position in pixels
+    dw $0917, $0006  ; Layer 2 X position
     dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0004  ; Supers
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0078  ; Samus X
     dw $0AFA, $008B  ; Samus Y
     dw #$FFFF
@@ -866,7 +858,6 @@ preset_kpdr20_upper_norfair_bat_cave_revisit:
     dw $0919, $0014  ; Layer 2 Y position
     dw $09A2, $3105  ; Equipped Items
     dw $09A4, $3105  ; Collected Items
-    dw $09CA, $0001  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $002D  ; Samus X
@@ -881,7 +872,6 @@ preset_kpdr20_upper_norfair_single_chamber:
     dw $079B, $ACB3  ; MDB
     dw $090F, $BFFF  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0104  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C3  ; Layer 2 Y position
@@ -1769,7 +1759,6 @@ preset_kpdr20_upper_norfair_revisit_ice_beam_gates:
     dw $078D, $9246  ; DDB
     dw $079B, $A7DE  ; MDB
     dw $07F3, $0015  ; Music Bank
-    dw $090F, $8000  ; Screen subpixel X position
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0238  ; Screen Y position in pixels
     dw $0919, $01AA  ; Layer 2 Y position
diff --git a/src/presets/kpdr21_data.asm b/src/presets/kpdr21_data.asm
index 161045fb8..0cbe36e0c 100644
--- a/src/presets/kpdr21_data.asm
+++ b/src/presets/kpdr21_data.asm
@@ -491,10 +491,8 @@ preset_kpdr21_brinstar_passing_through_maridia:
     dw $078D, $9132  ; DDB
     dw $079B, $A408  ; MDB
     dw $090F, $8000  ; Screen subpixel X position
-    dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $CC00  ; Screen subpixel Y position
     dw $0915, $0100  ; Screen Y position in pixels
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C0  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0005  ; Supers
@@ -512,7 +510,6 @@ preset_kpdr21_kraid_entering_kraids_lair:
     dw $0919, $0100  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
     dw $0AF6, $002E  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr21_kraid_warehouse_zeelas:
@@ -534,13 +531,14 @@ preset_kpdr21_kraid_warehouse_zeelas:
     dw #$FFFF
 
 preset_kpdr21_kraid_kraid_kihunters:
-    dw #preset_kpdr21_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
+    dw #preset_kpdr21_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
     dw $078D, $923A  ; DDB
     dw $079B, $A471  ; MDB
     dw $07F5, $0005  ; Music Track
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $8000  ; Screen subpixel Y position
+    dw $0915, $0100  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $0AF6, $0167  ; Samus X
@@ -642,14 +640,10 @@ preset_kpdr21_kraid_minikraid_revisit:
     dw $079B, $A56B  ; MDB
     dw $090F, $3000  ; Screen subpixel X position
     dw $0913, $7800  ; Screen subpixel Y position
-    dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $007C  ; Health
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0058  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr21_kraid_kraid_kihunters_revisit:
@@ -691,13 +685,11 @@ preset_kpdr21_kraid_business_center_preelev:
     dw $090F, $3000  ; Screen subpixel X position
     dw $0911, $0006  ; Screen X position in pixels
     dw $0913, $0000  ; Screen subpixel Y position
-    dw $0917, $0006  ; Layer 2 X position
     dw $0915, $0000  ; Screen Y position in pixels
+    dw $0917, $0006  ; Layer 2 X position
     dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0004  ; Supers
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0078  ; Samus X
     dw $0AFA, $008B  ; Samus Y
     dw #$FFFF
@@ -866,7 +858,6 @@ preset_kpdr21_upper_norfair_bat_cave_revisit:
     dw $0919, $0014  ; Layer 2 Y position
     dw $09A2, $3105  ; Equipped Items
     dw $09A4, $3105  ; Collected Items
-    dw $09CA, $0001  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $002D  ; Samus X
@@ -881,7 +872,6 @@ preset_kpdr21_upper_norfair_single_chamber:
     dw $079B, $ACB3  ; MDB
     dw $090F, $BFFF  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0104  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C3  ; Layer 2 Y position
@@ -1771,7 +1761,6 @@ preset_kpdr21_upper_norfair_revisit_ice_beam_gates:
     dw $078D, $9246  ; DDB
     dw $079B, $A7DE  ; MDB
     dw $07F3, $0015  ; Music Bank
-    dw $090F, $8000  ; Screen subpixel X position
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0238  ; Screen Y position in pixels
     dw $0919, $01AA  ; Layer 2 Y position
diff --git a/src/presets/kpdr22_data.asm b/src/presets/kpdr22_data.asm
index d2f5b2838..c662eed45 100644
--- a/src/presets/kpdr22_data.asm
+++ b/src/presets/kpdr22_data.asm
@@ -491,10 +491,8 @@ preset_kpdr22_brinstar_passing_through_maridia:
     dw $078D, $9132  ; DDB
     dw $079B, $A408  ; MDB
     dw $090F, $8000  ; Screen subpixel X position
-    dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $CC00  ; Screen subpixel Y position
     dw $0915, $0100  ; Screen Y position in pixels
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C0  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0005  ; Supers
@@ -512,7 +510,6 @@ preset_kpdr22_kraid_entering_kraids_lair:
     dw $0919, $0100  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
     dw $0AF6, $002E  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr22_kraid_warehouse_zeelas:
@@ -534,13 +531,14 @@ preset_kpdr22_kraid_warehouse_zeelas:
     dw #$FFFF
 
 preset_kpdr22_kraid_kraid_kihunters:
-    dw #preset_kpdr22_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
+    dw #preset_kpdr22_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
     dw $078D, $923A  ; DDB
     dw $079B, $A471  ; MDB
     dw $07F5, $0005  ; Music Track
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $8000  ; Screen subpixel Y position
+    dw $0915, $0100  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $0AF6, $0167  ; Samus X
@@ -642,14 +640,10 @@ preset_kpdr22_kraid_minikraid_revisit:
     dw $079B, $A56B  ; MDB
     dw $090F, $3000  ; Screen subpixel X position
     dw $0913, $7800  ; Screen subpixel Y position
-    dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $007C  ; Health
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0058  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr22_kraid_kraid_kihunters_revisit:
@@ -711,8 +705,6 @@ preset_kpdr22_kraid_business_center_preelev:
     dw $0911, $0006  ; Screen X position in pixels
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0917, $0006  ; Layer 2 X position
-    dw $0915, $0000  ; Screen Y position in pixels
-    dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0006  ; Missiles
     dw $09CA, $0004  ; Supers
     dw $0A1C, $0002  ; Samus position/state
@@ -885,7 +877,6 @@ preset_kpdr22_upper_norfair_hjb_missile_bat_cave_revisit:
     dw $0919, $0014  ; Layer 2 Y position
     dw $09A2, $3105  ; Equipped Items
     dw $09A4, $3105  ; Collected Items
-    dw $09CA, $0001  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $002D  ; Samus X
@@ -900,7 +891,6 @@ preset_kpdr22_upper_norfair_hjb_missile_single_chamber:
     dw $079B, $ACB3  ; MDB
     dw $090F, $BFFF  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0104  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C3  ; Layer 2 Y position
@@ -1155,7 +1145,6 @@ preset_kpdr22_upper_norfair_moat_missile_bat_cave_revisit:
     dw $0919, $0014  ; Layer 2 Y position
     dw $09A2, $3105  ; Equipped Items
     dw $09A4, $3105  ; Collected Items
-    dw $09CA, $0001  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $002D  ; Samus X
@@ -1170,7 +1159,6 @@ preset_kpdr22_upper_norfair_moat_missile_single_chamber:
     dw $079B, $ACB3  ; MDB
     dw $090F, $BFFF  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0104  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C3  ; Layer 2 Y position
@@ -2240,7 +2228,6 @@ preset_kpdr22_upper_norfair_revisit_ice_beam_gates:
     dw $078D, $9246  ; DDB
     dw $079B, $A7DE  ; MDB
     dw $07F3, $0015  ; Music Bank
-    dw $090F, $8000  ; Screen subpixel X position
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0238  ; Screen Y position in pixels
     dw $0919, $01AA  ; Layer 2 Y position
diff --git a/src/presets/kpdr23_data.asm b/src/presets/kpdr23_data.asm
index 99d5436e9..39fb49d58 100644
--- a/src/presets/kpdr23_data.asm
+++ b/src/presets/kpdr23_data.asm
@@ -491,14 +491,11 @@ preset_kpdr23_brinstar_spazer:
     dw $078D, $9102  ; DDB
     dw $079B, $A408  ; MDB
     dw $090F, $2000  ; Screen subpixel X position
-    dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $5000  ; Screen subpixel Y position
     dw $0915, $001D  ; Screen Y position in pixels
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0015  ; Layer 2 Y position
     dw $09CA, $0003  ; Supers
     dw $0AF6, $01B3  ; Samus X
-    dw $0AFA, $008B  ; Samus Y
     dw $D8B6, $8008  ; Doors
     dw #$FFFF
 
@@ -550,7 +547,6 @@ preset_kpdr23_kraid_entering_kraids_lair:
     dw $0919, $0100  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
     dw $0AF6, $002E  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr23_kraid_warehouse_zeelas:
@@ -572,13 +568,14 @@ preset_kpdr23_kraid_warehouse_zeelas:
     dw #$FFFF
 
 preset_kpdr23_kraid_kraid_kihunters:
-    dw #preset_kpdr23_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
+    dw #preset_kpdr23_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
     dw $078D, $923A  ; DDB
     dw $079B, $A471  ; MDB
     dw $07F5, $0005  ; Music Track
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $8000  ; Screen subpixel Y position
+    dw $0915, $0100  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $0AF6, $0167  ; Samus X
@@ -680,14 +677,10 @@ preset_kpdr23_kraid_minikraid_revisit:
     dw $079B, $A56B  ; MDB
     dw $090F, $3000  ; Screen subpixel X position
     dw $0913, $7800  ; Screen subpixel Y position
-    dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $007C  ; Health
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0058  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr23_kraid_kraid_kihunters_revisit:
@@ -749,8 +742,6 @@ preset_kpdr23_kraid_business_center_preelev:
     dw $0911, $0006  ; Screen X position in pixels
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0917, $0006  ; Layer 2 X position
-    dw $0915, $0000  ; Screen Y position in pixels
-    dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $000A  ; Missiles
     dw $09CA, $0004  ; Supers
     dw $0A1C, $0002  ; Samus position/state
@@ -937,7 +928,6 @@ preset_kpdr23_upper_norfair_single_chamber:
     dw $079B, $ACB3  ; MDB
     dw $090F, $BFFF  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0104  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $00C3  ; Layer 2 Y position
@@ -1828,7 +1818,6 @@ preset_kpdr23_upper_norfair_revisit_ice_beam_gates:
     dw $078D, $9246  ; DDB
     dw $079B, $A7DE  ; MDB
     dw $07F3, $0015  ; Music Bank
-    dw $090F, $8000  ; Screen subpixel X position
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0238  ; Screen Y position in pixels
     dw $0919, $01AA  ; Layer 2 Y position
diff --git a/src/presets/kpdr25_data.asm b/src/presets/kpdr25_data.asm
index 523ff7a58..9e8fa7ba2 100644
--- a/src/presets/kpdr25_data.asm
+++ b/src/presets/kpdr25_data.asm
@@ -491,14 +491,11 @@ preset_kpdr25_brinstar_spazer:
     dw $078D, $9102  ; DDB
     dw $079B, $A408  ; MDB
     dw $090F, $2000  ; Screen subpixel X position
-    dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $5000  ; Screen subpixel Y position
     dw $0915, $001D  ; Screen Y position in pixels
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0015  ; Layer 2 Y position
     dw $09CA, $0003  ; Supers
     dw $0AF6, $01B3  ; Samus X
-    dw $0AFA, $008B  ; Samus Y
     dw $D8B6, $8008  ; Doors
     dw #$FFFF
 
@@ -550,7 +547,6 @@ preset_kpdr25_kraid_entering_kraids_lair:
     dw $0919, $0100  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
     dw $0AF6, $002E  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr25_kraid_warehouse_zeelas:
@@ -572,13 +568,14 @@ preset_kpdr25_kraid_warehouse_zeelas:
     dw #$FFFF
 
 preset_kpdr25_kraid_kraid_kihunters:
-    dw #preset_kpdr25_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
+    dw #preset_kpdr25_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
     dw $078D, $923A  ; DDB
     dw $079B, $A471  ; MDB
     dw $07F5, $0005  ; Music Track
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $8000  ; Screen subpixel Y position
+    dw $0915, $0100  ; Screen Y position in pixels
     dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $0AF6, $0167  ; Samus X
@@ -680,14 +677,10 @@ preset_kpdr25_kraid_minikraid_revisit:
     dw $079B, $A56B  ; MDB
     dw $090F, $3000  ; Screen subpixel X position
     dw $0913, $7800  ; Screen subpixel Y position
-    dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $007C  ; Health
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0058  ; Samus X
-    dw $0AFA, $018B  ; Samus Y
     dw #$FFFF
 
 preset_kpdr25_kraid_kraid_kihunters_revisit:
@@ -749,8 +742,6 @@ preset_kpdr25_kraid_business_center_preelev:
     dw $0911, $0006  ; Screen X position in pixels
     dw $0913, $0000  ; Screen subpixel Y position
     dw $0917, $0006  ; Layer 2 X position
-    dw $0915, $0000  ; Screen Y position in pixels
-    dw $0919, $0000  ; Layer 2 Y position
     dw $09C6, $0009  ; Missiles
     dw $09CA, $0004  ; Supers
     dw $0A1C, $0002  ; Samus position/state
@@ -1843,7 +1834,6 @@ preset_kpdr25_maridia_lower_maridia_gate:
     dw $0915, $0100  ; Screen Y position in pixels
     dw $0919, $0100  ; Layer 2 Y position
     dw $09C2, $01F3  ; Health
-    dw $09CE, $0005  ; Pbs
     dw $0AF6, $002E  ; Samus X
     dw #$FFFF
 
@@ -1867,7 +1857,6 @@ preset_kpdr25_lower_norfair_magdollite_tunnel:
     dw $078D, $9576  ; DDB
     dw $079B, $AEDF  ; MDB
     dw $090F, $B001  ; Screen subpixel X position
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $01F4  ; Screen Y position in pixels
     dw $0919, $0177  ; Layer 2 Y position
     dw $0AF6, $0059  ; Samus X
@@ -1881,15 +1870,12 @@ preset_kpdr25_lower_norfair_ln_main_hall:
     dw $07F3, $0018  ; Music Bank
     dw $090F, $E000  ; Screen subpixel X position
     dw $0911, $0400  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0200  ; Screen Y position in pixels
     dw $0917, $0300  ; Layer 2 X position
     dw $0919, $0301  ; Layer 2 Y position
     dw $09C2, $01F0  ; Health
     dw $09C6, $0008  ; Missiles
     dw $09CE, $0004  ; Pbs
-    dw $0A1C, $009B  ; Samus position/state
-    dw $0A1E, $0000  ; More position/state
     dw $0AF6, $0480  ; Samus X
     dw $0AFA, $0288  ; Samus Y
     dw $D8BA, $01F1  ; Doors
@@ -2022,7 +2008,6 @@ preset_kpdr25_lower_norfair_ridley:
     dw $079B, $B37A  ; MDB
     dw $090F, $2000  ; Screen subpixel X position
     dw $0913, $5000  ; Screen subpixel Y position
-    dw $09C2, $01A5  ; Health
     dw $09CA, $0006  ; Supers
     dw $0AF6, $003D  ; Samus X
     dw $0AFA, $009B  ; Samus Y
@@ -2301,8 +2286,6 @@ preset_kpdr25_backtracking_green_pirate_shaft_revisit:
     dw $0915, $0200  ; Screen Y position in pixels
     dw $0917, $0000  ; Layer 2 X position
     dw $0919, $0180  ; Layer 2 Y position
-    dw $0A1C, $0002  ; Samus position/state
-    dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0073  ; Samus X
     dw $0AFA, $029B  ; Samus Y
     dw #$FFFF
diff --git a/src/presets/nodropskpdr_data.asm b/src/presets/nodropskpdr_data.asm
index 6774419aa..96d984e64 100644
--- a/src/presets/nodropskpdr_data.asm
+++ b/src/presets/nodropskpdr_data.asm
@@ -632,7 +632,6 @@ preset_nodropskpdr_refill_15_missiles_path_missile_refill:
     dw $0915, $061A  ; Screen Y position in pixels
     dw $0919, $0493  ; Layer 2 Y position
     dw $09C2, $0077  ; Health
-    dw $09C6, $0000  ; Missiles
     dw $09C8, $000F  ; Max missiles
     dw $09CA, $0005  ; Supers
     dw $09CC, $0005  ; Max supers
@@ -1049,7 +1048,6 @@ preset_nodropskpdr_refill_25_missiles_path_leaving_spore_spawn_supers:
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $0192  ; Samus X
     dw $0AFA, $088B  ; Samus Y
-    dw $D870, $D180  ; Items
     dw #$FFFF
 
 preset_nodropskpdr_refill_25_missiles_path_green_hill_zone:
@@ -1402,7 +1400,6 @@ preset_nodropskpdr_speed_wave_power_bombs_bat_cave_revisit:
     dw $0919, $0014  ; Layer 2 Y position
     dw $09A2, $3105  ; Equipped Items
     dw $09A4, $3105  ; Collected Items
-    dw $09C8, $0023  ; Max missiles
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state
     dw $0AF6, $002D  ; Samus X
diff --git a/src/presets/pkrd_data.asm b/src/presets/pkrd_data.asm
index bb7395157..fa68fe811 100644
--- a/src/presets/pkrd_data.asm
+++ b/src/presets/pkrd_data.asm
@@ -953,7 +953,6 @@ preset_pkrd_kraid_kraid_kihunters:
     dw $090F, $8000  ; Screen subpixel X position
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $0C00  ; Screen subpixel Y position
-    dw $0917, $00C0  ; Layer 2 X position
     dw $0919, $0100  ; Layer 2 Y position
     dw $09CA, $0007  ; Supers
     dw $09D2, $0000  ; Currently selected item
@@ -1831,8 +1830,6 @@ preset_pkrd_maridia_aqueduct:
     dw $0917, $0006  ; Layer 2 X position
     dw $0919, $0240  ; Layer 2 Y position
     dw $09D2, $0002  ; Currently selected item
-    dw $0A1C, $0001  ; Samus position/state
-    dw $0A1E, $0008  ; More position/state
     dw $0AF6, $0078  ; Samus X
     dw $0AFA, $03AB  ; Samus Y
     dw #$FFFF
@@ -1862,7 +1859,6 @@ preset_pkrd_maridia_botwoon:
     dw #preset_pkrd_maridia_botwoon_hallway ; Maridia: Botwoon Hallway
     dw $078D, $A72C  ; DDB
     dw $079B, $D617  ; MDB
-    dw $090F, $0000  ; Screen subpixel X position
     dw $0911, $0300  ; Screen X position in pixels
     dw $0913, $F800  ; Screen subpixel Y position
     dw $0915, $0001  ; Screen Y position in pixels
@@ -1946,7 +1942,6 @@ preset_pkrd_maridia_spikesuit_reverse_halfie:
     dw $0919, $0002  ; Layer 2 Y position
     dw $09C2, $00D8  ; Health
     dw $09C6, $000F  ; Missiles
-    dw $09CA, $0003  ; Supers
     dw $0A68, $0001  ; Flash suit
     dw $0AF6, $003F  ; Samus X
     dw $0AFA, $008B  ; Samus Y
@@ -2066,7 +2061,6 @@ preset_pkrd_backtracking_parlor_return:
     dw $07F3, $000C  ; Music Bank
     dw $07F5, $0005  ; Music Track
     dw $0911, $05E3  ; Screen X position in pixels
-    dw $0913, $0000  ; Screen subpixel Y position
     dw $0915, $0400  ; Screen Y position in pixels
     dw $0917, $02F1  ; Layer 2 X position
     dw $09C6, $0010  ; Missiles
diff --git a/src/presets/spazermap_data.asm b/src/presets/spazermap_data.asm
index 8752cdf0b..51abaa25f 100644
--- a/src/presets/spazermap_data.asm
+++ b/src/presets/spazermap_data.asm
@@ -4501,7 +4501,6 @@ preset_spazermap_greenpink_brin_cleanup_green_hill_zone_final:
     dw $09C2, $006B  ; Health
     dw $09C6, $0008  ; Missiles
     dw $09CA, $000B  ; Supers
-    dw $09CE, $0003  ; Pbs
     dw $0A1C, $0001  ; Samus position/state
     dw $0A1E, $0008  ; More position/state
     dw $0AF6, $035E  ; Samus X
@@ -4542,7 +4541,6 @@ preset_spazermap_blue_brinstar_cleanup_blue_brinstar_etank_room:
     dw $0919, $0000  ; Layer 2 Y position
     dw $09C2, $0069  ; Health
     dw $09C6, $0003  ; Missiles
-    dw $09CE, $0003  ; Pbs
     dw $09D2, $0000  ; Currently selected item
     dw $0AF6, $00D8  ; Samus X
     dw $CAE8, $0460  ; Map counter
@@ -4974,7 +4972,6 @@ preset_spazermap_tourian_baby_skip:
     dw $0911, $0100  ; Screen X position in pixels
     dw $0913, $1000  ; Screen subpixel Y position
     dw $0917, $00C0  ; Layer 2 X position
-    dw $09C2, $031F  ; Health
     dw $09CA, $000D  ; Supers
     dw $0A1C, $0002  ; Samus position/state
     dw $0A1E, $0004  ; More position/state