diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index ca04c93e74..2fe5c18fe0 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Alert;
 using Content.Shared.CCVar;
+using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 26684b8882..f0a723f3c0 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -2,6 +2,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
+using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 159637a9e0..36e971862a 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -51,13 +51,14 @@ namespace Content.Shared.Friction
             _gridQuery = GetEntityQuery<MapGridComponent>();
         }
 
-        public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
+        public override void UpdateBeforeSolve(bool prediction, float frameTime)
         {
-            base.UpdateBeforeMapSolve(prediction, mapComponent, frameTime);
+            base.UpdateBeforeSolve(prediction, frameTime);
 
-            foreach (var body in mapComponent.AwakeBodies)
+            foreach (var ent in PhysicsSystem.AwakeBodies)
             {
-                var uid = body.Owner;
+                var uid = ent.Owner;
+                var body = ent.Comp1;
 
                 // Only apply friction when it's not a mob (or the mob doesn't have control)
                 // We may want to instead only apply friction to dynamic entities and not mobs ever.
@@ -67,12 +68,7 @@ namespace Content.Shared.Friction
                 if (body.LinearVelocity.Equals(Vector2.Zero) && body.AngularVelocity.Equals(0f))
                     continue;
 
-                if (!_xformQuery.TryGetComponent(uid, out var xform))
-                {
-                    Log.Error($"Unable to get transform for {ToPrettyString(uid)} in tilefrictioncontroller");
-                    continue;
-                }
-
+                var xform = ent.Comp2;
                 float friction;
 
                 // If we're not touching the ground, don't use tileFriction.
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 759d6c57ca..e43800dc9f 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -74,6 +74,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     public override void Initialize()
     {
+        UpdatesBefore.Add(typeof(TileFrictionController));
         base.Initialize();
 
         MoverQuery = GetEntityQuery<InputMoverComponent>();
@@ -98,7 +99,6 @@ public abstract partial class SharedMoverController : VirtualController
         Subs.CVar(_configManager, CCVars.MinFriction, value => _minDamping = value, true);
         Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true);
         Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
-        UpdatesBefore.Add(typeof(TileFrictionController));
     }
 
     public override void Shutdown()
diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml
index a2668db44b..2e303f835c 100644
--- a/Resources/Maps/Dungeon/experiment.yml
+++ b/Resources/Maps/Dungeon/experiment.yml
@@ -42,7 +42,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2223,7 +2222,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: Airlock
   entities:
diff --git a/Resources/Maps/Dungeon/haunted.yml b/Resources/Maps/Dungeon/haunted.yml
index e0353a1e3f..2b01fe5659 100644
--- a/Resources/Maps/Dungeon/haunted.yml
+++ b/Resources/Maps/Dungeon/haunted.yml
@@ -22,7 +22,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - chunks:
@@ -352,7 +351,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: AirCanister
   entities:
diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index ebf267a9c2..2c29d5beb9 100644
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -28,7 +28,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2685,7 +2684,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: AirlockBrigGlassLocked
   entities:
diff --git a/Resources/Maps/Dungeon/maints.yml b/Resources/Maps/Dungeon/maints.yml
index ae7ec85858..d7d99ad3f1 100644
--- a/Resources/Maps/Dungeon/maints.yml
+++ b/Resources/Maps/Dungeon/maints.yml
@@ -25,9 +25,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml
index 898b7e8ff2..df006c1e63 100644
--- a/Resources/Maps/Dungeon/mineshaft.yml
+++ b/Resources/Maps/Dungeon/mineshaft.yml
@@ -17,7 +17,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -109,7 +108,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
     - type: DecalGrid
       chunkCollection:
diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml
index 27e4fe1c07..b93333488c 100644
--- a/Resources/Maps/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -47,7 +47,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2869,7 +2868,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: Airlock
   entities:
diff --git a/Resources/Maps/Dungeon/template.yml b/Resources/Maps/Dungeon/template.yml
index d499b454a8..6968500e57 100644
--- a/Resources/Maps/Dungeon/template.yml
+++ b/Resources/Maps/Dungeon/template.yml
@@ -13,7 +13,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -76,6 +75,5 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 ...
diff --git a/Resources/Maps/Dungeon/vgroidinterior.yml b/Resources/Maps/Dungeon/vgroidinterior.yml
index c096471126..e7625f0c02 100644
--- a/Resources/Maps/Dungeon/vgroidinterior.yml
+++ b/Resources/Maps/Dungeon/vgroidinterior.yml
@@ -22,9 +22,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
diff --git a/Resources/Maps/Lavaland/basalt_ruin.yml b/Resources/Maps/Lavaland/basalt_ruin.yml
index 6cd492375c..af9933f065 100644
--- a/Resources/Maps/Lavaland/basalt_ruin.yml
+++ b/Resources/Maps/Lavaland/basalt_ruin.yml
@@ -148,9 +148,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: BasaltRandom
diff --git a/Resources/Maps/Lavaland/crashedsyndiepod.yml b/Resources/Maps/Lavaland/crashedsyndiepod.yml
index 2e516623b1..b2b0ca9013 100644
--- a/Resources/Maps/Lavaland/crashedsyndiepod.yml
+++ b/Resources/Maps/Lavaland/crashedsyndiepod.yml
@@ -245,9 +245,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AirCanister
diff --git a/Resources/Maps/Lavaland/wrecked_outpost.yml b/Resources/Maps/Lavaland/wrecked_outpost.yml
index 9772a75e03..1d2c05b323 100644
--- a/Resources/Maps/Lavaland/wrecked_outpost.yml
+++ b/Resources/Maps/Lavaland/wrecked_outpost.yml
@@ -153,9 +153,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AirlockEngineeringLocked
diff --git a/Resources/Maps/Nonstations/dm01-entryway.yml b/Resources/Maps/Nonstations/dm01-entryway.yml
index 874fbb0178..bb252e35ab 100644
--- a/Resources/Maps/Nonstations/dm01-entryway.yml
+++ b/Resources/Maps/Nonstations/dm01-entryway.yml
@@ -29,9 +29,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapLight
diff --git a/Resources/Maps/Nonstations/meteor-arena.yml b/Resources/Maps/Nonstations/meteor-arena.yml
index 92320b491f..64f52fdc77 100644
--- a/Resources/Maps/Nonstations/meteor-arena.yml
+++ b/Resources/Maps/Nonstations/meteor-arena.yml
@@ -22,9 +22,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapLight
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 69a498b7aa..554e242410 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1630,9 +1630,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: FTLDestination
       whitelist:
         tags:
diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml
index 87b6336f73..a50bf22fe1 100644
--- a/Resources/Maps/Test/dev_map.yml
+++ b/Resources/Maps/Test/dev_map.yml
@@ -1709,9 +1709,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml
index 830926268e..000b91ea43 100644
--- a/Resources/Maps/Test/empty.yml
+++ b/Resources/Maps/Test/empty.yml
@@ -46,9 +46,7 @@ entities:
       name: map 89
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: SpawnPointLatejoin
diff --git a/Resources/Maps/Test/npc_test_map.yml b/Resources/Maps/Test/npc_test_map.yml
index 8f7493a980..66dd4e7b55 100644
--- a/Resources/Maps/Test/npc_test_map.yml
+++ b/Resources/Maps/Test/npc_test_map.yml
@@ -13,12 +13,10 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
     - type: GridTree
-    - type: MovedGrids
   - uid: 10
     components:
     - type: MetaData
diff --git a/Resources/Maps/Test/test_teg.yml b/Resources/Maps/Test/test_teg.yml
index 4a101265bb..830e5012a9 100644
--- a/Resources/Maps/Test/test_teg.yml
+++ b/Resources/Maps/Test/test_teg.yml
@@ -15,9 +15,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index a475726cd9..2946726429 100644
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -80,9 +80,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 3dc84c0761..cbee5a1327 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -9561,9 +9561,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index b82df7eb12..eaeb2db3c4 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -75,9 +75,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 5691
diff --git a/Resources/Maps/convex.yml b/Resources/Maps/convex.yml
index 6f38a05f8c..1381e2d156 100644
--- a/Resources/Maps/convex.yml
+++ b/Resources/Maps/convex.yml
@@ -16360,9 +16360,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AcousticGuitarInstrument
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index cea879b607..b57bcd2229 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -11777,9 +11777,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
@@ -106504,11 +106502,11 @@ entities:
         After several simulations where Superconducting Magnetic Energy Storage units were drained from the main system from [italic]a variety[/italic] of user errors and other shenanigans, it has been determined that the Singularity should be put on its own power loop, disconnected from the main station. The upsides of this include but are not limited to:
 
 
-        [bold]1.[/bold] Limited external forces from the containments power. 
+        [bold]1.[/bold] Limited external forces from the containments power.
 
-        [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. 
+        [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue.
 
-        [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. 
+        [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system.
 
 
         [italic]While we have listed the upsides we also acknowledge the downside,[/italic] for it being on its own loop you will need an external force if the system "runs out of juice". Our recommendation for this is simply attaching a generator to said SMES and letting it get to full charge before continuing operations but as said from another of our technicians... "just attach it to the main grid for like, a hot moment, and kickstart the thing!"
diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml
index 81adf37508..2701afe708 100644
--- a/Resources/Maps/elkridge.yml
+++ b/Resources/Maps/elkridge.yml
@@ -52,9 +52,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 850beef1f4..ff2a3de6de 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -69,9 +69,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 13329
diff --git a/Resources/Maps/gate.yml b/Resources/Maps/gate.yml
index 76dde2f15b..cab587675f 100644
--- a/Resources/Maps/gate.yml
+++ b/Resources/Maps/gate.yml
@@ -97,9 +97,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
diff --git a/Resources/Maps/loop.yml b/Resources/Maps/loop.yml
index f1072a72ea..5a918fa10c 100644
--- a/Resources/Maps/loop.yml
+++ b/Resources/Maps/loop.yml
@@ -59,9 +59,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index feaf12eb5e..f0f886e1e3 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -7621,9 +7621,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AcousticGuitarInstrument
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index f85ca5a21d..fb4b4a0d83 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -75,9 +75,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 5350
diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
index 9d8b2a7832..8a7aa578f5 100644
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
@@ -80,9 +80,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
@@ -38526,23 +38524,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38573,17 +38571,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38632,23 +38630,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38679,17 +38677,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38738,23 +38736,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38785,17 +38783,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38846,23 +38844,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38893,17 +38891,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index fec3c994c1..732ab0eee8 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -55,9 +55,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 4812
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 4b21699902..723af65e15 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -6620,9 +6620,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AccordionInstrument
diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 7d6183dd5e..a354c816e5 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -68,9 +68,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml
index 9d4b1aa8fc..47632d9922 100644
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -44,9 +44,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
diff --git a/Resources/Maps/relic.yml b/Resources/Maps/relic.yml
index a7862dde76..65033273a2 100644
--- a/Resources/Maps/relic.yml
+++ b/Resources/Maps/relic.yml
@@ -47,9 +47,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 4a8f4a85f3..826045296e 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -3378,9 +3378,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml
index fe3615e3f1..a8f68d846c 100644
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
@@ -71,9 +71,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax