diff --git a/QSB/Animation/AnimationSync.cs b/QSB/Animation/AnimationSync.cs
index 2793dd2a..7d025ee9 100644
--- a/QSB/Animation/AnimationSync.cs
+++ b/QSB/Animation/AnimationSync.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Linq;
-using OWML.ModHelper.Events;
+using OWML.ModHelper.Events;
 using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
+using System;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -129,7 +129,7 @@ namespace QSB.Animation
         private void OnSuitUp() => SendTrigger(AnimTrigger.SuitUp);
         private void OnSuitDown() => SendTrigger(AnimTrigger.SuitDown);
 
-        private void SendTrigger(AnimTrigger trigger, float value = 0)
+        public void SendTrigger(AnimTrigger trigger, float value = 0)
         {
             var message = new AnimTriggerMessage
             {
diff --git a/QSB/DeathSync/DeathPatches.cs b/QSB/DeathSync/DeathPatches.cs
index 58c26dea..a7b15b1a 100644
--- a/QSB/DeathSync/DeathPatches.cs
+++ b/QSB/DeathSync/DeathPatches.cs
@@ -1,5 +1,5 @@
-using System.Linq;
-using QSB.Events;
+using QSB.Events;
+using System.Linq;
 
 namespace QSB.DeathSync
 {
diff --git a/QSB/DeathSync/PreventShipDestruction.cs b/QSB/DeathSync/PreventShipDestruction.cs
index e7061aba..4ab33b41 100644
--- a/QSB/DeathSync/PreventShipDestruction.cs
+++ b/QSB/DeathSync/PreventShipDestruction.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.Reflection.Emit;
-using Harmony;
+using Harmony;
 using OWML.ModHelper.Events;
+using System.Collections.Generic;
+using System.Reflection.Emit;
 using UnityEngine;
 
 namespace QSB.DeathSync
diff --git a/QSB/DeathSync/RespawnOnDeath.cs b/QSB/DeathSync/RespawnOnDeath.cs
index 3891cb35..317263ff 100644
--- a/QSB/DeathSync/RespawnOnDeath.cs
+++ b/QSB/DeathSync/RespawnOnDeath.cs
@@ -1,6 +1,6 @@
-using System.Linq;
-using OWML.ModHelper.Events;
+using OWML.ModHelper.Events;
 using QSB.Events;
+using System.Linq;
 using UnityEngine;
 
 namespace QSB.DeathSync
diff --git a/QSB/ElevatorSync/ElevatorManager.cs b/QSB/ElevatorSync/ElevatorManager.cs
index 64b46bdf..0da090a5 100644
--- a/QSB/ElevatorSync/ElevatorManager.cs
+++ b/QSB/ElevatorSync/ElevatorManager.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using QSB.WorldSync;
+using System.Collections.Generic;
 using System.Linq;
-using QSB.WorldSync;
 using UnityEngine;
 
 namespace QSB.ElevatorSync
diff --git a/QSB/PlayerInfo.cs b/QSB/PlayerInfo.cs
index 6e1dba31..f2b2996c 100644
--- a/QSB/PlayerInfo.cs
+++ b/QSB/PlayerInfo.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Linq;
-using QSB.Tools;
+using QSB.Tools;
 using QSB.TransformSync;
 using QSB.Utility;
+using System;
+using System.Linq;
 using UnityEngine;
 
 namespace QSB
@@ -10,7 +10,6 @@ namespace QSB
     public class PlayerInfo
     {
         public uint NetId { get; }
-        public GameObject Body { get; set; }
         public GameObject Camera { get; set; }
         public GameObject ProbeBody { get; set; }
         public QSBProbe Probe { get; set; }
diff --git a/QSB/PlayerRegistry.cs b/QSB/PlayerRegistry.cs
index d360f7cc..791d15e2 100644
--- a/QSB/PlayerRegistry.cs
+++ b/QSB/PlayerRegistry.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Linq;
-using QSB.TransformSync;
-using QSB.Animation;
+using QSB.Animation;
 using QSB.Messaging;
-using System;
+using QSB.TransformSync;
 using QSB.Utility;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 
 namespace QSB
 {
diff --git a/QSB/QSBNetworkLobby.cs b/QSB/QSBNetworkLobby.cs
index e096e6f6..c573cbdf 100644
--- a/QSB/QSBNetworkLobby.cs
+++ b/QSB/QSBNetworkLobby.cs
@@ -1,6 +1,6 @@
-using System;
+using OWML.ModHelper.Events;
+using System;
 using System.Linq;
-using OWML.ModHelper.Events;
 using UnityEngine;
 using UnityEngine.Networking;
 
diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs
index c30264c8..015495b8 100644
--- a/QSB/QSBNetworkManager.cs
+++ b/QSB/QSBNetworkManager.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Linq;
-using QSB.Animation;
+using QSB.Animation;
 using QSB.DeathSync;
 using QSB.Events;
 using QSB.GeyserSync;
 using QSB.TimeSync;
 using QSB.TransformSync;
 using QSB.Utility;
+using System;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Networking;
 
diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs
index bf40997d..0dbce3ef 100644
--- a/QSB/Tools/PlayerToolsManager.cs
+++ b/QSB/Tools/PlayerToolsManager.cs
@@ -1,5 +1,5 @@
-using System.Linq;
-using OWML.ModHelper.Events;
+using OWML.ModHelper.Events;
+using System.Linq;
 using UnityEngine;
 
 namespace QSB.Tools
diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs
index f08bc43b..0e63ddb5 100644
--- a/QSB/TransformSync/PlayerCameraSync.cs
+++ b/QSB/TransformSync/PlayerCameraSync.cs
@@ -19,8 +19,6 @@ namespace QSB.TransformSync
         {
             var body = Locator.GetPlayerCamera().gameObject.transform;
 
-            PlayerToolsManager.Init(body);
-
             Player.Camera = body.gameObject;
 
             Player.IsReady = true;
diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/TransformSync/PlayerProbeSync.cs
index 3a904299..024e5cc8 100644
--- a/QSB/TransformSync/PlayerProbeSync.cs
+++ b/QSB/TransformSync/PlayerProbeSync.cs
@@ -9,7 +9,7 @@ namespace QSB.TransformSync
 
         protected override uint PlayerIdOffset => 3;
 
-        public Transform bodyTransform;
+        private Transform _disabledSocket;
 
         public override void OnStartLocalPlayer()
         {
@@ -25,8 +25,7 @@ namespace QSB.TransformSync
         {
             var body = GetProbe();
 
-            bodyTransform = body;
-
+            _disabledSocket = Player.Camera.transform;
             Player.ProbeBody = body.gameObject;
 
             return body;
@@ -44,8 +43,7 @@ namespace QSB.TransformSync
 
             PlayerToolsManager.CreateProbe(body, Player);
 
-            bodyTransform = body;
-
+            _disabledSocket = Player.ProbeLauncher.ToolGameObject.transform;
             Player.ProbeBody = body.gameObject;
 
             return body;
@@ -60,7 +58,7 @@ namespace QSB.TransformSync
             }
             if (hasAuthority)
             {
-                transform.position = ReferenceSector.Transform.InverseTransformPoint(Player.ProbeLauncher.ToolGameObject.transform.position);
+                transform.position = ReferenceSector.Transform.InverseTransformPoint(_disabledSocket.position);
                 return;
             }
             if (SyncedTransform.position == Vector3.zero ||
@@ -68,7 +66,7 @@ namespace QSB.TransformSync
             {
                 return;
             }
-            SyncedTransform.localPosition = ReferenceSector.Transform.InverseTransformPoint(Player.ProbeLauncher.ToolGameObject.transform.position);
+            SyncedTransform.localPosition = ReferenceSector.Transform.InverseTransformPoint(_disabledSocket.position);
         }
 
         public override bool IsReady => Locator.GetProbe() != null && PlayerRegistry.PlayerExists(PlayerId) && Player.IsReady;
diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs
index c57681c5..09373a59 100644
--- a/QSB/TransformSync/PlayerTransformSync.cs
+++ b/QSB/TransformSync/PlayerTransformSync.cs
@@ -30,8 +30,6 @@ namespace QSB.TransformSync
 
             GetComponent<AnimationSync>().InitLocal(body);
 
-            Player.Body = body.gameObject;
-
             return body;
         }
 
@@ -44,8 +42,6 @@ namespace QSB.TransformSync
             var marker = body.gameObject.AddComponent<PlayerHUDMarker>();
             marker.Init(Player);
 
-            Player.Body = body.gameObject;
-
             return body;
         }
 
diff --git a/QSB/TransformSync/QSBSectorManager.cs b/QSB/TransformSync/QSBSectorManager.cs
index b077d044..d72beecc 100644
--- a/QSB/TransformSync/QSBSectorManager.cs
+++ b/QSB/TransformSync/QSBSectorManager.cs
@@ -1,5 +1,5 @@
-using System.Linq;
-using QSB.WorldSync;
+using QSB.WorldSync;
+using System.Linq;
 using UnityEngine;
 
 namespace QSB.TransformSync
diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs
index 0a335076..9dd586fc 100644
--- a/QSB/TransformSync/SectorSync.cs
+++ b/QSB/TransformSync/SectorSync.cs
@@ -1,5 +1,5 @@
-using UnityEngine;
-using QSB.Events;
+using QSB.Events;
+using UnityEngine;
 
 namespace QSB.TransformSync
 {
diff --git a/QSB/Utility/DebugLog.cs b/QSB/Utility/DebugLog.cs
index 4081b992..d15cc2a0 100644
--- a/QSB/Utility/DebugLog.cs
+++ b/QSB/Utility/DebugLog.cs
@@ -1,7 +1,7 @@
-using System;
+using OWML.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using OWML.Common;
 
 namespace QSB.Utility
 {