diff --git a/QSB/Animation/NPC/CharacterAnimManager.cs b/QSB/Animation/NPC/CharacterAnimManager.cs
index 24291324..c690fbdd 100644
--- a/QSB/Animation/NPC/CharacterAnimManager.cs
+++ b/QSB/Animation/NPC/CharacterAnimManager.cs
@@ -1,6 +1,7 @@
 using QSB.Animation.NPC.WorldObjects;
 using QSB.WorldSync;
 using System.Linq;
+using UnityEngine;
 
 namespace QSB.Animation.NPC
 {
@@ -15,7 +16,7 @@ namespace QSB.Animation.NPC
 
 			//MOVE : this is the wrong place to put this... move it to Conversations?
 			QSBWorldSync.OldDialogueTrees.Clear();
-			QSBWorldSync.OldDialogueTrees = QSBWorldSync.GetUnityObjects<CharacterDialogueTree>().ToList();
+			QSBWorldSync.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList();
 		}
 	}
 }
diff --git a/QSB/DeathSync/RespawnOnDeath.cs b/QSB/DeathSync/RespawnOnDeath.cs
index 6f1c917f..2245fc35 100644
--- a/QSB/DeathSync/RespawnOnDeath.cs
+++ b/QSB/DeathSync/RespawnOnDeath.cs
@@ -3,7 +3,6 @@ using OWML.Utils;
 using QSB.Events;
 using QSB.Player;
 using QSB.Player.TransformSync;
-using QSB.WorldSync;
 using QSB.Utility;
 using System.Linq;
 using UnityEngine;
@@ -76,7 +75,7 @@ namespace QSB.DeathSync
 			}
 			else
 			{
-				var allAstroobjects = QSBWorldSync.GetUnityObjects<AstroObject>().Where(x => x.GetAstroObjectName() != AstroObject.Name.None && x.GetAstroObjectType() != AstroObject.Type.Satellite);
+				var allAstroobjects = Resources.FindObjectsOfTypeAll<AstroObject>().Where(x => x.GetAstroObjectName() != AstroObject.Name.None && x.GetAstroObjectType() != AstroObject.Type.Satellite);
 				var ordered = allAstroobjects.OrderBy(x => Vector3.SqrMagnitude(x.transform.position));
 				DeathClosestAstroObject = ordered.First().transform;
 			}
diff --git a/QSB/MeteorSync/MeteorManager.cs b/QSB/MeteorSync/MeteorManager.cs
index 17f5aed7..1ebe6a72 100644
--- a/QSB/MeteorSync/MeteorManager.cs
+++ b/QSB/MeteorSync/MeteorManager.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using QSB.MeteorSync.WorldObjects;
 using QSB.WorldSync;
+using UnityEngine;
 
 namespace QSB.MeteorSync
 {
@@ -17,7 +18,7 @@ namespace QSB.MeteorSync
 				QSBWorldSync.Init<QSBMeteorLauncher, MeteorLauncher>();
 				QSBWorldSync.Init<QSBMeteor, MeteorController>();
 				QSBWorldSync.Init<QSBFragment, FragmentIntegrity>();
-				WhiteHoleVolume = QSBWorldSync.GetUnityObjects<WhiteHoleVolume>().First();
+				WhiteHoleVolume = Resources.FindObjectsOfTypeAll<WhiteHoleVolume>().First();
 				Ready = true;
 			}, 10);
 		}
diff --git a/QSB/OrbSync/OrbManager.cs b/QSB/OrbSync/OrbManager.cs
index e04584fc..2689e6c0 100644
--- a/QSB/OrbSync/OrbManager.cs
+++ b/QSB/OrbSync/OrbManager.cs
@@ -25,7 +25,7 @@ namespace QSB.OrbSync
 		{
 			QSBWorldSync.OldOrbList.Clear();
 			NomaiOrbTransformSync.OrbTransformSyncs.Clear();
-			QSBWorldSync.OldOrbList = QSBWorldSync.GetUnityObjects<NomaiInterfaceOrb>().ToList();
+			QSBWorldSync.OldOrbList = Resources.FindObjectsOfTypeAll<NomaiInterfaceOrb>().ToList();
 			if (QSBCore.IsHost)
 			{
 				_orbs.ForEach(x => QNetworkServer.Destroy(x));
diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs
index 6dbd20dc..ee6d5852 100644
--- a/QSB/Player/TransformSync/PlayerTransformSync.cs
+++ b/QSB/Player/TransformSync/PlayerTransformSync.cs
@@ -40,7 +40,7 @@ namespace QSB.Player.TransformSync
 		protected Quaternion _roastingRotationVelocity;
 
 		private Transform GetStickPivot()
-			=> QSBWorldSync.GetUnityObjects<RoastingStickController>().First().transform.Find("Stick_Root/Stick_Pivot");
+			=> Resources.FindObjectsOfTypeAll<RoastingStickController>().First().transform.Find("Stick_Root/Stick_Pivot");
 
 		public override void OnStartLocalPlayer()
 			=> LocalInstance = this;
diff --git a/QSB/PoolSync/PoolManager.cs b/QSB/PoolSync/PoolManager.cs
index 59edc022..d5b93fe5 100644
--- a/QSB/PoolSync/PoolManager.cs
+++ b/QSB/PoolSync/PoolManager.cs
@@ -1,4 +1,5 @@
 using QSB.WorldSync;
+using UnityEngine;
 
 namespace QSB.PoolSync
 {
@@ -6,17 +7,17 @@ namespace QSB.PoolSync
 	{
 		protected override void RebuildWorldObjects(OWScene scene)
 		{
-			foreach (var streaming in QSBWorldSync.GetUnityObjects<NomaiRemoteCameraStreaming>())
+			foreach (var streaming in Resources.FindObjectsOfTypeAll<NomaiRemoteCameraStreaming>())
 			{
 				streaming.gameObject.AddComponent<CustomNomaiRemoteCameraStreaming>();
 			}
 
-			foreach (var camera in QSBWorldSync.GetUnityObjects<NomaiRemoteCamera>())
+			foreach (var camera in Resources.FindObjectsOfTypeAll<NomaiRemoteCamera>())
 			{
 				camera.gameObject.AddComponent<CustomNomaiRemoteCamera>();
 			}
 
-			foreach (var platform in QSBWorldSync.GetUnityObjects<NomaiRemoteCameraPlatform>())
+			foreach (var platform in Resources.FindObjectsOfTypeAll<NomaiRemoteCameraPlatform>())
 			{
 				platform.gameObject.AddComponent<CustomNomaiRemoteCameraPlatform>();
 			}
diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs
index 723ccbbb..10f0a2ad 100644
--- a/QSB/QSBNetworkManager.cs
+++ b/QSB/QSBNetworkManager.cs
@@ -161,7 +161,7 @@ namespace QSB
 			DebugLog.DebugWrite("OnStartServer", MessageType.Info);
 			if (QSBWorldSync.OldDialogueTrees.Count == 0 && QSBSceneManager.IsInUniverse)
 			{
-				QSBWorldSync.OldDialogueTrees = QSBWorldSync.GetUnityObjects<CharacterDialogueTree>().ToList();
+				QSBWorldSync.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList();
 			}
 		}
 
@@ -291,17 +291,17 @@ namespace QSB
 		{
 			QSBWorldSync.RemoveWorldObjects<IWorldObjectTypeSubset>();
 			QSBWorldSync.RemoveWorldObjects<IWorldObject>();
-			foreach (var platform in QSBWorldSync.GetUnityObjects<CustomNomaiRemoteCameraPlatform>())
+			foreach (var platform in Resources.FindObjectsOfTypeAll<CustomNomaiRemoteCameraPlatform>())
 			{
 				Destroy(platform);
 			}
 
-			foreach (var camera in QSBWorldSync.GetUnityObjects<CustomNomaiRemoteCamera>())
+			foreach (var camera in Resources.FindObjectsOfTypeAll<CustomNomaiRemoteCamera>())
 			{
 				Destroy(camera);
 			}
 
-			foreach (var streaming in QSBWorldSync.GetUnityObjects<CustomNomaiRemoteCameraStreaming>())
+			foreach (var streaming in Resources.FindObjectsOfTypeAll<CustomNomaiRemoteCameraStreaming>())
 			{
 				Destroy(streaming);
 			}
diff --git a/QSB/QuantumSync/QuantumManager.cs b/QSB/QuantumSync/QuantumManager.cs
index 97aed940..6fabcb17 100644
--- a/QSB/QuantumSync/QuantumManager.cs
+++ b/QSB/QuantumSync/QuantumManager.cs
@@ -42,7 +42,7 @@ namespace QSB.QuantumSync
 			QSBWorldSync.Init<QSBEyeProxyQuantumMoon, EyeProxyQuantumMoon>();
 			if (scene == OWScene.SolarSystem)
 			{
-				Shrine = QSBWorldSync.GetUnityObjects<QuantumShrine>().First();
+				Shrine = Resources.FindObjectsOfTypeAll<QuantumShrine>().First();
 			}
 		}
 
diff --git a/QSB/RoastingSync/Events/MarshmallowEventEvent.cs b/QSB/RoastingSync/Events/MarshmallowEventEvent.cs
index 75d78e31..d9ce46f0 100644
--- a/QSB/RoastingSync/Events/MarshmallowEventEvent.cs
+++ b/QSB/RoastingSync/Events/MarshmallowEventEvent.cs
@@ -3,7 +3,6 @@ using QSB.Events;
 using QSB.Messaging;
 using QSB.Player;
 using QSB.Utility;
-using QSB.WorldSync;
 using System.Linq;
 using UnityEngine;
 
@@ -67,7 +66,7 @@ namespace QSB.RoastingSync.Events
 			var stick = player.RoastingStick;
 			var stickTip = stick.transform.GetChild(0);
 
-			var mallowPrefab = QSBWorldSync.GetUnityObjects<RoastingStickController>().First().GetValue<GameObject>("_mallowBodyPrefab");
+			var mallowPrefab = Resources.FindObjectsOfTypeAll<RoastingStickController>().First().GetValue<GameObject>("_mallowBodyPrefab");
 
 			var tossedMallow = Object.Instantiate(mallowPrefab, stickTip.position, stickTip.rotation);
 			var rigidbody = tossedMallow.GetComponent<OWRigidbody>();
diff --git a/QSB/SatelliteSync/SatelliteProjectorManager.cs b/QSB/SatelliteSync/SatelliteProjectorManager.cs
index 3affdff9..dd90d4ad 100644
--- a/QSB/SatelliteSync/SatelliteProjectorManager.cs
+++ b/QSB/SatelliteSync/SatelliteProjectorManager.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using QSB.WorldSync;
 using UnityEngine;
 
 namespace QSB.SatelliteSync
@@ -22,7 +21,7 @@ namespace QSB.SatelliteSync
 		{
 			if (newScene == OWScene.SolarSystem)
 			{
-				Projector = QSBWorldSync.GetUnityObjects<SatelliteSnapshotController>().First();
+				Projector = Resources.FindObjectsOfTypeAll<SatelliteSnapshotController>().First();
 				Projector._loopingSource.spatialBlend = 1f;
 				Projector._oneShotSource.spatialBlend = 1f;
 			}
diff --git a/QSB/SectorSync/WorldObjects/QSBSector.cs b/QSB/SectorSync/WorldObjects/QSBSector.cs
index 63b3ae51..aaf4f223 100644
--- a/QSB/SectorSync/WorldObjects/QSBSector.cs
+++ b/QSB/SectorSync/WorldObjects/QSBSector.cs
@@ -81,7 +81,7 @@ namespace QSB.SectorSync.WorldObjects
 				}
 				else if (QSBSceneManager.CurrentScene == OWScene.EyeOfTheUniverse)
 				{
-					var shuttleController = QSBWorldSync.GetUnityObjects<EyeShuttleController>().First();
+					var shuttleController = Resources.FindObjectsOfTypeAll<EyeShuttleController>().First();
 					if (shuttleController == null)
 					{
 						DebugLog.ToConsole($"Warning - Expected to find a EyeShuttleController for {AttachedObject.name}!", MessageType.Warning);
diff --git a/QSB/ShipSync/ShipManager.cs b/QSB/ShipSync/ShipManager.cs
index 9d008d31..d2b55251 100644
--- a/QSB/ShipSync/ShipManager.cs
+++ b/QSB/ShipSync/ShipManager.cs
@@ -61,9 +61,9 @@ namespace QSB.ShipSync
 			}
 
 			HatchInteractZone = HatchController.GetComponent<InteractZone>();
-			ShipTractorBeam = QSBWorldSync.GetUnityObjects<ShipTractorBeamSwitch>().First();
-			CockpitController = QSBWorldSync.GetUnityObjects<ShipCockpitController>().First();
-			ShipElectricalComponent = QSBWorldSync.GetUnityObjects<ShipElectricalComponent>().First();
+			ShipTractorBeam = Resources.FindObjectsOfTypeAll<ShipTractorBeamSwitch>().First();
+			CockpitController = Resources.FindObjectsOfTypeAll<ShipCockpitController>().First();
+			ShipElectricalComponent = Resources.FindObjectsOfTypeAll<ShipElectricalComponent>().First();
 
 			var sphereShape = HatchController.GetComponent<SphereShape>();
 			sphereShape.radius = 2.5f;
diff --git a/QSB/Syncs/SyncBase.cs b/QSB/Syncs/SyncBase.cs
index b991ea2f..3f67544d 100644
--- a/QSB/Syncs/SyncBase.cs
+++ b/QSB/Syncs/SyncBase.cs
@@ -28,7 +28,7 @@ namespace QSB.Syncs
 			if (wantedSync == default)
 			{
 				DebugLog.ToConsole($"Error -  _storedTransformSyncs does not contain type:{typeof(T)} under player {player.PlayerId}. Attempting to find manually...", MessageType.Error);
-				var allSyncs = QSBWorldSync.GetUnityObjects<T>();
+				var allSyncs = Resources.FindObjectsOfTypeAll<T>();
 				wantedSync = allSyncs.First(x => x.Player == player);
 				if (wantedSync == default)
 				{
@@ -100,7 +100,7 @@ namespace QSB.Syncs
 
 		public virtual void Start()
 		{
-			var lowestBound = QSBWorldSync.GetUnityObjects<PlayerTransformSync>()
+			var lowestBound = Resources.FindObjectsOfTypeAll<PlayerTransformSync>()
 				.Where(x => x.NetId.Value <= NetId.Value).OrderBy(x => x.NetId.Value).Last();
 			NetIdentity.SetRootIdentity(lowestBound.NetIdentity);
 
diff --git a/QSB/TimeSync/TimeSyncUI.cs b/QSB/TimeSync/TimeSyncUI.cs
index 75e6981e..aa34eaf9 100644
--- a/QSB/TimeSync/TimeSyncUI.cs
+++ b/QSB/TimeSync/TimeSyncUI.cs
@@ -1,6 +1,5 @@
 using OWML.Utils;
 using QSB.Utility;
-using QSB.WorldSync;
 using System;
 using System.Linq;
 using UnityEngine;
@@ -32,7 +31,7 @@ namespace QSB.TimeSync
 		private void OnUniverseSceneLoad(OWScene oldScene, OWScene newScene)
 		{
 			_isSetUp = true;
-			var obj = QSBWorldSync.GetUnityObjects<SleepTimerUI>().First();
+			var obj = Resources.FindObjectsOfTypeAll<SleepTimerUI>().First();
 			_canvas = obj.GetValue<Canvas>("_canvas");
 			_text = obj.GetValue<Text>("_text");
 			_canvas.enabled = false;
diff --git a/QSB/Tools/ProbeTool/QSBProbeEffects.cs b/QSB/Tools/ProbeTool/QSBProbeEffects.cs
index 2d549084..2992a17a 100644
--- a/QSB/Tools/ProbeTool/QSBProbeEffects.cs
+++ b/QSB/Tools/ProbeTool/QSBProbeEffects.cs
@@ -1,5 +1,4 @@
 using QSB.Utility;
-using QSB.WorldSync;
 using System.Linq;
 using UnityEngine;
 
@@ -15,7 +14,7 @@ namespace QSB.Tools.ProbeTool
 
 		private void Awake()
 		{
-			_probe = QSBWorldSync.GetUnityObjects<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
+			_probe = Resources.FindObjectsOfTypeAll<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
 			if (_probe == null)
 			{
 				DebugLog.ToConsole($"Error - Couldn't find QSBProbe!", OWML.Common.MessageType.Error);
diff --git a/QSB/Tools/ProbeTool/QSBProbeLantern.cs b/QSB/Tools/ProbeTool/QSBProbeLantern.cs
index a76275a6..ec94ff2b 100644
--- a/QSB/Tools/ProbeTool/QSBProbeLantern.cs
+++ b/QSB/Tools/ProbeTool/QSBProbeLantern.cs
@@ -1,5 +1,4 @@
 using QSB.Utility;
-using QSB.WorldSync;
 using System.Linq;
 using UnityEngine;
 
@@ -23,7 +22,7 @@ namespace QSB.Tools.ProbeTool
 
 		private void Awake()
 		{
-			_probe = QSBWorldSync.GetUnityObjects<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
+			_probe = Resources.FindObjectsOfTypeAll<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
 			if (_probe == null)
 			{
 				DebugLog.ToConsole($"Error - Couldn't find QSBProbe!", OWML.Common.MessageType.Error);
diff --git a/QSB/Tools/ProbeTool/QSBProbeSpotlight.cs b/QSB/Tools/ProbeTool/QSBProbeSpotlight.cs
index 013b74fd..4e9a17cc 100644
--- a/QSB/Tools/ProbeTool/QSBProbeSpotlight.cs
+++ b/QSB/Tools/ProbeTool/QSBProbeSpotlight.cs
@@ -1,5 +1,4 @@
 using QSB.Utility;
-using QSB.WorldSync;
 using System.Linq;
 using UnityEngine;
 
@@ -17,7 +16,7 @@ namespace QSB.Tools.ProbeTool
 
 		private void Awake()
 		{
-			_probe = QSBWorldSync.GetUnityObjects<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
+			_probe = Resources.FindObjectsOfTypeAll<QSBProbe>().First(x => gameObject.transform.IsChildOf(x.transform));
 			if (_probe == null)
 			{
 				DebugLog.ToConsole($"Error - Couldn't find QSBProbe!", OWML.Common.MessageType.Error);
diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs
index fc4ffbbf..457817bb 100644
--- a/QSB/WorldSync/QSBWorldSync.cs
+++ b/QSB/WorldSync/QSBWorldSync.cs
@@ -152,17 +152,12 @@ namespace QSB.WorldSync
 			WorldObjects.RemoveAll(x => x is TWorldObject);
 		}
 
-		public static IEnumerable<TUnityObject> GetUnityObjects<TUnityObject>()
-			where TUnityObject : MonoBehaviour
-			=> Resources.FindObjectsOfTypeAll<TUnityObject>()
-				.Where(x => x.gameObject.scene.name != null);
-
 		public static void Init<TWorldObject, TUnityObject>()
 			where TWorldObject : WorldObject<TUnityObject>
 			where TUnityObject : MonoBehaviour
 		{
 			RemoveWorldObjects<TWorldObject>();
-			var list = GetUnityObjects<TUnityObject>().ToList();
+			var list = Resources.FindObjectsOfTypeAll<TUnityObject>().ToList();
 			//DebugLog.DebugWrite($"{typeof(TWorldObject).Name} init : {list.Count} instances.", MessageType.Info);
 			for (var id = 0; id < list.Count; id++)
 			{