diff --git a/QSB/Animation/NPC/Messages/NpcAnimationMessage.cs b/QSB/Animation/NPC/Messages/NpcAnimationMessage.cs
index e451e6e3..27ab4e39 100644
--- a/QSB/Animation/NPC/Messages/NpcAnimationMessage.cs
+++ b/QSB/Animation/NPC/Messages/NpcAnimationMessage.cs
@@ -1,6 +1,5 @@
 using QSB.Animation.NPC.WorldObjects;
 using QSB.Messaging;
-using QSB.WorldSync;
 
 namespace QSB.Animation.NPC.Messages
 {
@@ -10,8 +9,6 @@ namespace QSB.Animation.NPC.Messages
 
 		public NpcAnimationMessage() { }
 
-		public override bool ShouldReceive => WorldObjectManager.AllObjectsReady;
-
 		public override void OnReceiveRemote()
 		{
 			if (Value)
diff --git a/QSB/Messaging/QSBWorldObjectMessage.cs b/QSB/Messaging/QSBWorldObjectMessage.cs
index ea05d460..ccea9e7b 100644
--- a/QSB/Messaging/QSBWorldObjectMessage.cs
+++ b/QSB/Messaging/QSBWorldObjectMessage.cs
@@ -11,7 +11,7 @@ namespace QSB.Messaging
 		/// </summary>
 		internal int ObjectId;
 		/// <summary>
-		/// set automatically when receiving
+		/// set automatically by ShouldReceive
 		/// </summary>
 		protected T WorldObject { get; private set; }
 
@@ -27,9 +27,6 @@ namespace QSB.Messaging
 			ObjectId = reader.ReadInt32();
 		}
 
-		/// <summary>
-		/// sets WorldObject using ObjectId
-		/// </summary>
 		public override bool ShouldReceive
 		{
 			get