diff --git a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
index fe774d945e..97d7f2c6a5 100644
--- a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
+++ b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
@@ -4,6 +4,7 @@ using Content.Shared.SubFloor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Disposal.Visualizers
@@ -48,7 +49,7 @@ namespace Content.Client.Disposal.Visualizers
             }
             else if (appearance.Owner.HasComponent<SubFloorHideComponent>())
             {
-                appearance.Owner.RemoveComponent<SubFloorHideComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<SubFloorHideComponent>(appearance.Owner.Uid);
             }
         }
 
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index c74262e2f0..adb339ae15 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -153,7 +153,7 @@ namespace Content.Client.Entry
         {
             if (!((!IoCManager.Resolve<IEntityManager>().EntityExists(eventArgs.OldEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(eventArgs.OldEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted))
             {
-                eventArgs.OldEntity.RemoveComponent<CharacterInterfaceComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<CharacterInterfaceComponent>(eventArgs.OldEntity.Uid);
             }
         }
 
diff --git a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
index cc61d19c3b..f902cdedf2 100644
--- a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
+++ b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
@@ -1,5 +1,6 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Weapons.Melee.Components
@@ -45,7 +46,7 @@ namespace Content.Client.Weapons.Melee.Components
 
             if (deleteSelf)
             {
-                Owner.RemoveComponent<MeleeLungeComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<MeleeLungeComponent>(Owner.Uid);
             }
         }
     }
diff --git a/Content.Server/AI/Commands/AddAiCommand.cs b/Content.Server/AI/Commands/AddAiCommand.cs
index 39aa4ae546..3a107d0133 100644
--- a/Content.Server/AI/Commands/AddAiCommand.cs
+++ b/Content.Server/AI/Commands/AddAiCommand.cs
@@ -44,7 +44,7 @@ namespace Content.Server.AI.Commands
             // TODO: IMover refffaaccctttooorrr
             if (ent.HasComponent<IMoverComponent>())
             {
-                ent.RemoveComponent<IMoverComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<IMoverComponent>(ent.Uid);
             }
 
             var comp = IoCManager.Resolve<IEntityManager>().AddComponent<UtilityAi>(ent);
diff --git a/Content.Server/Administration/Commands/RejuvenateCommand.cs b/Content.Server/Administration/Commands/RejuvenateCommand.cs
index 21b1d2f171..39a348bbd1 100644
--- a/Content.Server/Administration/Commands/RejuvenateCommand.cs
+++ b/Content.Server/Administration/Commands/RejuvenateCommand.cs
@@ -76,7 +76,7 @@ namespace Content.Server.Administration.Commands
 
             if (target.HasComponent<JitteringComponent>())
             {
-                target.RemoveComponent<JitteringComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<JitteringComponent>(target.Uid);
             }
         }
     }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index fa3b2a1cfc..8da8695dd9 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -63,7 +63,7 @@ namespace Content.Server.Cloning
                 !parent.TryGetComponent<CloningPodComponent>(out var cloningPodComponent) ||
                 component.Owner != cloningPodComponent.BodyContainer?.ContainedEntity)
             {
-                component.Owner.RemoveComponent<BeingClonedComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(component.Owner.Uid);
                 return;
             }
 
diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs
index aaeea3948e..db7bfe47a7 100644
--- a/Content.Server/Cloning/Components/CloningPodComponent.cs
+++ b/Content.Server/Cloning/Components/CloningPodComponent.cs
@@ -171,7 +171,7 @@ namespace Content.Server.Cloning.Components
             if (entity == null || CloningProgress < CloningTime)
                 return;
 
-            entity.RemoveComponent<BeingClonedComponent>();
+            IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(entity.Uid);
             BodyContainer.Remove(entity!);
             CapturedMind = null;
             CloningProgress = 0f;
diff --git a/Content.Server/Mind/Mind.cs b/Content.Server/Mind/Mind.cs
index 43bb641a8d..1e0c481c42 100644
--- a/Content.Server/Mind/Mind.cs
+++ b/Content.Server/Mind/Mind.cs
@@ -379,7 +379,7 @@ namespace Content.Server.Mind
 
             if (oldVisitingEnt!.HasComponent<VisitingMindComponent>())
             {
-                oldVisitingEnt.RemoveComponent<VisitingMindComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<VisitingMindComponent>(oldVisitingEnt.Uid);
             }
 
             IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage());
diff --git a/Content.Server/Pointing/Components/PointingArrowComponent.cs b/Content.Server/Pointing/Components/PointingArrowComponent.cs
index e72a7142db..2dc10ad800 100644
--- a/Content.Server/Pointing/Components/PointingArrowComponent.cs
+++ b/Content.Server/Pointing/Components/PointingArrowComponent.cs
@@ -76,7 +76,7 @@ namespace Content.Server.Pointing.Components
             {
                 if (_rogue)
                 {
-                    Owner.RemoveComponent<PointingArrowComponent>();
+                    IoCManager.Resolve<IEntityManager>().RemoveComponent<PointingArrowComponent>(Owner.Uid);
                     IoCManager.Resolve<IEntityManager>().AddComponent<RoguePointingArrowComponent>(Owner);
                     return;
                 }
diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs
index e5bdd14b11..8ec2f80718 100644
--- a/Content.Server/Tabletop/TabletopSystem.Session.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Session.cs
@@ -3,6 +3,7 @@ using Content.Shared.Tabletop.Events;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
@@ -116,7 +117,7 @@ namespace Content.Server.Tabletop
                 gamer.Tabletop = EntityUid.Invalid;
 
                 // You stop being a gamer.......
-                attachedEntity.RemoveComponent<TabletopGamerComponent>();
+                IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(attachedEntity.Uid);
             }
 
             session.Players.Remove(player);
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index f278639445..99ac7b76cd 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -99,7 +99,7 @@ namespace Content.Server.Tabletop
 
                 if (!gamer.Owner.TryGetComponent(out ActorComponent? actor))
                 {
-                    gamer.Owner.RemoveComponent<TabletopGamerComponent>();
+                    IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(gamer.Owner.Uid);
                     return;
                 };