diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index e3f24a800f..971a551029 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -83,18 +83,7 @@ namespace Content.Server.Physics.Controllers
 
             if (!_mapManager.TryGetGrid(gridId, out var grid) || !EntityManager.TryGetEntity(grid.GridEntityId, out var gridEntity)) return;
 
-            //TODO: Switch to shuttle component
-            if (!gridEntity.TryGetComponent(out PhysicsComponent? physics))
-            {
-                physics = gridEntity.AddComponent<PhysicsComponent>();
-                physics.BodyStatus = BodyStatus.InAir;
-                physics.CanCollide = true;
-                physics.AddFixture(new Fixture(physics, new PhysShapeGrid(grid)));
-            }
-
-            // TODO: Uhh this probably doesn't work but I still need to rip out the entity tree and make RenderingTreeSystem use grids so I'm not overly concerned about breaking shuttles.
-            physics.ApplyForce(mover.VelocityDir.walking + mover.VelocityDir.sprinting);
-            mover.VelocityDir = (Vector2.Zero, Vector2.Zero);
+            // This is on shuttle branch trust me
         }
 
         protected override void HandleFootsteps(IMoverComponent mover, IMobMoverComponent mobMover)
diff --git a/Content.Tools/test/0A.yml b/Content.Tools/test/0A.yml
index 9399d2d377..d595d4236f 100644
--- a/Content.Tools/test/0A.yml
+++ b/Content.Tools/test/0A.yml
@@ -88,9 +88,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-       !type:PhysShapeGrid
-         grid: 0
-    type: Physics
 
diff --git a/Content.Tools/test/0B.yml b/Content.Tools/test/0B.yml
index 9d9c99e9c2..eb3a3c690e 100644
--- a/Content.Tools/test/0B.yml
+++ b/Content.Tools/test/0B.yml
@@ -79,8 +79,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - !type:PhysShapeGrid
-      grid: 0
-    type: Physics
 
diff --git a/Content.Tools/test/0C.yml b/Content.Tools/test/0C.yml
index de44d5871b..4ee4b4eb4a 100644
--- a/Content.Tools/test/0C.yml
+++ b/Content.Tools/test/0C.yml
@@ -98,9 +98,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
 
diff --git a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
index 63dce1bf34..f6c2480d8a 100644
--- a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
+++ b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
@@ -58,10 +58,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape: !type:PhysShapeGrid
-        grid: 0
-    type: Physics
   - tiles:
       -1,-1: 0
       0,-1: 0
diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml
index e9979e70cf..cf293569fb 100644
--- a/Resources/Maps/Test/empty.yml
+++ b/Resources/Maps/Test/empty.yml
@@ -47,9 +47,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
 ...
diff --git a/Resources/Maps/Test/singularity.yml b/Resources/Maps/Test/singularity.yml
index ceb80b4927..66539dafc2 100644
--- a/Resources/Maps/Test/singularity.yml
+++ b/Resources/Maps/Test/singularity.yml
@@ -77,11 +77,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
   - uniqueMixes:
     - volume: 2500
       moles:
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 9383b08baf..69c4448469 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -8285,10 +8285,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape: !type:PhysShapeGrid
-        grid: 0
-    type: Physics
   - tiles:
       -16,-16: 0
       -16,-15: 0