diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
index 0adf15156d..eac865db92 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
@@ -13,8 +13,7 @@ namespace Content.Client.Atmos.EntitySystems;
 public sealed class AtmosPipeAppearanceSystem : EntitySystem
 {
     [Dependency] private readonly IResourceCache _resCache = default!;
-    [Dependency] private readonly SubFloorHideSystem _subfloorSys = default!;
-    
+
     public override void Initialize()
     {
         base.Initialize();
@@ -65,7 +64,7 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
 
         // transform connected directions to local-coordinates
         var connectedDirections = worldConnectedDirections.RotatePipeDirection(-Transform(uid).LocalRotation);
-        
+
         foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
         {
             if (!args.Sprite.LayerMapTryGet(layerKey, out var key))
diff --git a/Content.Client/Atmos/Monitor/AtmosMonitorVisualizer.cs b/Content.Client/Atmos/Monitor/AtmosMonitorVisualizer.cs
index 76591b6ffc..81118d5c5c 100644
--- a/Content.Client/Atmos/Monitor/AtmosMonitorVisualizer.cs
+++ b/Content.Client/Atmos/Monitor/AtmosMonitorVisualizer.cs
@@ -26,6 +26,7 @@ namespace Content.Client.Atmos.Monitor
         [DataField("setOnDepowered")]
         private readonly Dictionary<string, string>? _setOnDepowered;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -33,6 +34,7 @@ namespace Content.Client.Atmos.Monitor
             IoCManager.InjectDependencies(this);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             if (!_entityManager.TryGetComponent<SpriteComponent>(component.Owner, out var sprite))
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 1215560d7d..f4cbc5310b 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -24,7 +24,6 @@ namespace Content.Client.Audio
         [Dependency] private readonly IBaseClient _client = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPlayerManager _playMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
diff --git a/Content.Client/Buckle/BuckleVisualizer.cs b/Content.Client/Buckle/BuckleVisualizer.cs
index 6daae3eec5..0be425f45d 100644
--- a/Content.Client/Buckle/BuckleVisualizer.cs
+++ b/Content.Client/Buckle/BuckleVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Buckle
     [UsedImplicitly]
     public sealed class BuckleVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             if (!component.TryGetData<bool>(BuckleVisuals.Buckled, out var buckled) ||
diff --git a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
index 7964f40e4f..89c14d00c1 100644
--- a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
@@ -33,6 +33,7 @@ namespace Content.Client.Chemistry.Visualizers
             flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(_state, 0f));
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
index 38690b293d..cc77c2ce34 100644
--- a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
@@ -10,6 +10,7 @@ namespace Content.Client.Chemistry.Visualizers
     [UsedImplicitly]
     public sealed class SmokeVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs b/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
index bd479ba8fd..e6b0f99ad9 100644
--- a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
@@ -35,6 +35,7 @@ namespace Content.Client.Chemistry.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
index 8874628c77..4e97784250 100644
--- a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
+++ b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
@@ -10,7 +10,6 @@ namespace Content.Client.CloningConsole.UI
     [GenerateTypedNameReferences]
     public partial class CloningConsoleWindow : DefaultWindow
     {
-        [Dependency] private readonly IGameTiming _timing = default!;
         public CloningConsoleWindow()
         {
             IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Computer/ComputerVisualizer.cs b/Content.Client/Computer/ComputerVisualizer.cs
index 357ba2a766..68e8531515 100644
--- a/Content.Client/Computer/ComputerVisualizer.cs
+++ b/Content.Client/Computer/ComputerVisualizer.cs
@@ -20,6 +20,7 @@ namespace Content.Client.Computer
         private string BodyBrokenState = "broken";
         private string ScreenBroken = "computer_broken";
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -35,6 +36,7 @@ namespace Content.Client.Computer
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Construction/MachineFrameVisualizer.cs b/Content.Client/Construction/MachineFrameVisualizer.cs
index 5c0bae6e83..fc19bfbbd4 100644
--- a/Content.Client/Construction/MachineFrameVisualizer.cs
+++ b/Content.Client/Construction/MachineFrameVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.Construction
     [UsedImplicitly]
     public sealed class MachineFrameVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
index 587142ec6f..d36fa3a2c0 100644
--- a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
+++ b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
@@ -24,8 +24,6 @@ public sealed partial class CrewManifestUi : DefaultWindow
 
     private readonly CrewManifestSystem _crewManifestSystem;
 
-    private EntityUid? _station;
-
     public CrewManifestUi()
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/Damage/DamageVisualizer.cs b/Content.Client/Damage/DamageVisualizer.cs
index bc45972dce..2c8c528659 100644
--- a/Content.Client/Damage/DamageVisualizer.cs
+++ b/Content.Client/Damage/DamageVisualizer.cs
@@ -195,6 +195,11 @@ namespace Content.Client.Damage
             public readonly string? Color;
         }
 
+        /// <summary>
+        ///     Initializes an entity to be managed by this appearance controller.
+        ///     DO NOT assume this is your only entity. Visualizers are shared.
+        /// </summary>
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -492,6 +497,7 @@ namespace Content.Client.Damage
             spriteComponent.LayerSetVisible(newLayer, false);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             var entities = _entityManager;
diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
index e2d258cd85..2d9bb9ffa1 100644
--- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
+++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
@@ -141,6 +141,7 @@ namespace Content.Client.Disposal.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -151,6 +152,7 @@ namespace Content.Client.Disposal.Visualizers
             ChangeState(appearance);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs
index 03a2fb1071..6769568f71 100644
--- a/Content.Client/Doors/AirlockVisualizer.cs
+++ b/Content.Client/Doors/AirlockVisualizer.cs
@@ -134,6 +134,7 @@ namespace Content.Client.Doors
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             if (!_entMan.HasComponent<AnimationPlayerComponent>(entity))
@@ -142,6 +143,7 @@ namespace Content.Client.Doors
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             // only start playing animations once.
diff --git a/Content.Client/Explosion/ClusterGrenadeVisualizer.cs b/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
index 18795c813c..2e9ae93cae 100644
--- a/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
+++ b/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
@@ -14,6 +14,7 @@ namespace Content.Client.Explosion
         [DataField("state")]
         private string? _state;
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Fluids/PuddleVisualizer.cs b/Content.Client/Fluids/PuddleVisualizer.cs
index d92da99020..f1c610126f 100644
--- a/Content.Client/Fluids/PuddleVisualizer.cs
+++ b/Content.Client/Fluids/PuddleVisualizer.cs
@@ -23,6 +23,7 @@ namespace Content.Client.Fluids
         // Whether the puddle has a unique sprite we don't want to overwrite
         [DataField("customPuddleSprite")] public bool CustomPuddleSprite;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -44,6 +45,7 @@ namespace Content.Client.Fluids
             spriteComponent.Rotation = Angle.FromDegrees(_random.Next(0, 359));
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
index 0ab9d2661a..f9f0bed815 100644
--- a/Content.Client/Gravity/GravityGeneratorVisualizer.cs
+++ b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
@@ -38,6 +38,7 @@ namespace Content.Client.Gravity
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -49,6 +50,7 @@ namespace Content.Client.Gravity
             sprite.LayerMapReserveBlank(GravityGeneratorVisualLayers.Core);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 25fd5e8412..d40cdd7568 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -232,7 +232,7 @@ namespace Content.Client.IconSmoothing
             sprite.LayerSetState(0, $"{smooth.StateBase}{(int) dirs}");
         }
 
-        protected bool MatchingEntity(IconSmoothComponent smooth, IEnumerable<EntityUid> candidates, EntityQuery<IconSmoothComponent> smoothQuery)
+        private bool MatchingEntity(IconSmoothComponent smooth, IEnumerable<EntityUid> candidates, EntityQuery<IconSmoothComponent> smoothQuery)
         {
             foreach (var entity in candidates)
             {
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index acbe06c565..0e477978b6 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Info
 {
     public sealed class RulesAndInfoWindow : DefaultWindow
     {
-        [Dependency] private readonly RulesManager _rulesManager = default!;
         [Dependency] private readonly IResourceCache _resourceManager = default!;
         [Dependency] private readonly IConfigurationManager _cfgManager = default!;
 
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index e9394338a8..0b52e3b5bd 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -18,7 +18,6 @@ namespace Content.Client.Kitchen.UI
     public sealed class MicrowaveBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         private MicrowaveMenu? _menu;
 
diff --git a/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
index b720794981..93d66e0d3d 100644
--- a/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Kitchen.Visualizers
     [UsedImplicitly]
     public sealed class MicrowaveVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
index 6309bb5169..e02cc96ccb 100644
--- a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
@@ -7,6 +7,7 @@ namespace Content.Client.Kitchen.Visualizers
 {
     public sealed class ReagentGrinderVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/LanternVisualizer.cs b/Content.Client/Light/LanternVisualizer.cs
index 3e1bb4d0dc..5c6bc03305 100644
--- a/Content.Client/Light/LanternVisualizer.cs
+++ b/Content.Client/Light/LanternVisualizer.cs
@@ -30,6 +30,7 @@ namespace Content.Client.Light
             }
         };
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs b/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs
index af106a08e1..03f8a87d87 100644
--- a/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.Light.Visualizers
     [DataDefinition]
     public sealed class EmergencyLightVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
index da317f5a2c..a83239b6b5 100644
--- a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
@@ -12,6 +12,7 @@ namespace Content.Client.Light.Visualizers
     [UsedImplicitly]
     public sealed class ExpendableLightVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/Visualizers/FlashLightVisualizer.cs b/Content.Client/Light/Visualizers/FlashLightVisualizer.cs
index 663676a237..1fdacef51d 100644
--- a/Content.Client/Light/Visualizers/FlashLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/FlashLightVisualizer.cs
@@ -57,6 +57,7 @@ namespace Content.Client.Light.Visualizers
         private Action<string>? _radiatingCallback;
         private Action<string>? _blinkingCallback;
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/Visualizers/LightBulbVisualizer.cs b/Content.Client/Light/Visualizers/LightBulbVisualizer.cs
index 9fcfefeed9..228f2e57ee 100644
--- a/Content.Client/Light/Visualizers/LightBulbVisualizer.cs
+++ b/Content.Client/Light/Visualizers/LightBulbVisualizer.cs
@@ -10,6 +10,7 @@ namespace Content.Client.Light.Visualizers
     [UsedImplicitly]
     public sealed class LightBulbVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
index ec19bd619e..2b91408057 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
@@ -19,6 +19,7 @@ namespace Content.Client.Light.Visualizers
 
         private Action<string>? _blinkingCallback;
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/MachineLinking/SignalSwitchVisualizer.cs b/Content.Client/MachineLinking/SignalSwitchVisualizer.cs
index e5689eb5c8..3eb6f2c880 100644
--- a/Content.Client/MachineLinking/SignalSwitchVisualizer.cs
+++ b/Content.Client/MachineLinking/SignalSwitchVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.MachineLinking
         [DataField("layer")]
         private int Layer { get; }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -23,6 +24,7 @@ namespace Content.Client.MachineLinking
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
index 0e3d2bcf2f..87601d45ce 100644
--- a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
+++ b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
@@ -11,6 +11,7 @@ namespace Content.Client.MedicalScanner
     [UsedImplicitly]
     public sealed class MedicalScannerVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
index ad993c667e..2bf06ec6a0 100644
--- a/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
+++ b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Nutrition.Visualizers
         [DataField("state")]
         private string? _state;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -24,6 +25,7 @@ namespace Content.Client.Nutrition.Visualizers
             sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, false);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs b/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
index 589ac074c6..285140e0a1 100644
--- a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
+++ b/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
@@ -16,6 +16,7 @@ namespace Content.Client.Nutrition.Visualizers
         [DataField("stateOpen")]
         private string? _stateOpen;
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index f2439d134a..32275fa260 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -21,7 +21,6 @@ public sealed class TargetOutlineSystem : EntitySystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
 
     private bool _enabled = false;
 
diff --git a/Content.Client/PDA/PDAVisualizer.cs b/Content.Client/PDA/PDAVisualizer.cs
index 67288a029b..7f8ca7a5e3 100644
--- a/Content.Client/PDA/PDAVisualizer.cs
+++ b/Content.Client/PDA/PDAVisualizer.cs
@@ -25,6 +25,7 @@ namespace Content.Client.PDA
             IDLight
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -45,6 +46,7 @@ namespace Content.Client.PDA
             sprite.LayerSetVisible(PDAVisualLayers.IDLight, appearance.IdSlot.StartingItem != null);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Parallax/Data/GeneratedParallaxTextureSource.cs b/Content.Client/Parallax/Data/GeneratedParallaxTextureSource.cs
index 8c3ff55f6a..638051a6d5 100644
--- a/Content.Client/Parallax/Data/GeneratedParallaxTextureSource.cs
+++ b/Content.Client/Parallax/Data/GeneratedParallaxTextureSource.cs
@@ -45,7 +45,7 @@ public sealed class GeneratedParallaxTextureSource : IParallaxTextureSource
     /// </summary>
     private ResourcePath PreviousParallaxConfigPath => new($"/parallax_{Identifier}config_old");
 
-    async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel = default)
+    async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel)
     {
         var parallaxConfig = GetParallaxConfig();
         if (parallaxConfig == null)
diff --git a/Content.Client/Parallax/Data/ImageParallaxTextureSource.cs b/Content.Client/Parallax/Data/ImageParallaxTextureSource.cs
index bbd49dd4c3..8ebb970fc7 100644
--- a/Content.Client/Parallax/Data/ImageParallaxTextureSource.cs
+++ b/Content.Client/Parallax/Data/ImageParallaxTextureSource.cs
@@ -18,9 +18,9 @@ public sealed class ImageParallaxTextureSource : IParallaxTextureSource
     [DataField("path", required: true)]
     public ResourcePath Path { get; } = default!;
 
-    async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel = default)
+    Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel)
     {
-        return StaticIoC.ResC.GetTexture(Path);
+        return Task.FromResult(StaticIoC.ResC.GetTexture(Path));
     }
 }
 
diff --git a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
index 0b7eed35af..2f6b448602 100644
--- a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
+++ b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
@@ -33,6 +33,7 @@ namespace Content.Client.ParticleAccelerator
             _states.Add(ParticleAcceleratorVisualState.Level3, _baseState + "p3");
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -47,6 +48,7 @@ namespace Content.Client.ParticleAccelerator
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Pinpointer/PinpointerVisualizer.cs b/Content.Client/Pinpointer/PinpointerVisualizer.cs
index 0ac8794119..9236fede5b 100644
--- a/Content.Client/Pinpointer/PinpointerVisualizer.cs
+++ b/Content.Client/Pinpointer/PinpointerVisualizer.cs
@@ -10,6 +10,7 @@ namespace Content.Client.Pinpointer
     [UsedImplicitly]
     public sealed class PinpointerVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs b/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs
index dc3905939f..4e893f30f5 100644
--- a/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs
+++ b/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs
@@ -7,6 +7,7 @@ namespace Content.Client.PneumaticCannon
 {
     public sealed class PneumaticCannonVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Pointing/RoguePointingArrowVisualizer.cs b/Content.Client/Pointing/RoguePointingArrowVisualizer.cs
index 6a0fbb4170..fe8e359563 100644
--- a/Content.Client/Pointing/RoguePointingArrowVisualizer.cs
+++ b/Content.Client/Pointing/RoguePointingArrowVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Pointing
     [UsedImplicitly]
     public sealed class RoguePointingArrowVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 3841164bcb..da57acef85 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Client.Popups
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
-        [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
diff --git a/Content.Client/Power/APC/ApcVisualizer.cs b/Content.Client/Power/APC/ApcVisualizer.cs
index a596239ab6..f731ff567e 100644
--- a/Content.Client/Power/APC/ApcVisualizer.cs
+++ b/Content.Client/Power/APC/ApcVisualizer.cs
@@ -15,6 +15,7 @@ namespace Content.Client.Power.APC
         public static readonly Color EmagColor = Color.FromHex("#1f48d6");
 
         [UsedImplicitly]
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -37,6 +38,7 @@ namespace Content.Client.Power.APC
             sprite.LayerSetShader(Layers.Environment, "unshaded");
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Power/SMES/SmesVisualizer.cs b/Content.Client/Power/SMES/SmesVisualizer.cs
index a2725f2062..67b8abc571 100644
--- a/Content.Client/Power/SMES/SmesVisualizer.cs
+++ b/Content.Client/Power/SMES/SmesVisualizer.cs
@@ -10,6 +10,7 @@ namespace Content.Client.Power.SMES
     [UsedImplicitly]
     public sealed class SmesVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -25,6 +26,7 @@ namespace Content.Client.Power.SMES
             sprite.LayerSetShader(Layers.Output, "unshaded");
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
index 7a6d3d4f85..30542deb65 100644
--- a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
+++ b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.Power
     [UsedImplicitly]
     public sealed class PowerDeviceVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/PowerCell/PowerChargerVisualizer.cs b/Content.Client/PowerCell/PowerChargerVisualizer.cs
index 0a471d8fe0..31c97a4fcf 100644
--- a/Content.Client/PowerCell/PowerChargerVisualizer.cs
+++ b/Content.Client/PowerCell/PowerChargerVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.PowerCell
     [UsedImplicitly]
     public sealed class PowerChargerVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -23,6 +24,7 @@ namespace Content.Client.PowerCell
             sprite.LayerSetShader(Layers.Light, "unshaded");
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Recycling/RecyclerVisualizer.cs b/Content.Client/Recycling/RecyclerVisualizer.cs
index 2fa63516e0..75f1c1c0e3 100644
--- a/Content.Client/Recycling/RecyclerVisualizer.cs
+++ b/Content.Client/Recycling/RecyclerVisualizer.cs
@@ -17,6 +17,7 @@ namespace Content.Client.Recycling
         [DataField("state_off")]
         private string _stateOff = "grinder-o0";
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -31,6 +32,7 @@ namespace Content.Client.Recycling
             UpdateAppearance(appearance, sprite);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Rotation/RotationVisualizer.cs b/Content.Client/Rotation/RotationVisualizer.cs
index 336f0faf74..0e188aa1e6 100644
--- a/Content.Client/Rotation/RotationVisualizer.cs
+++ b/Content.Client/Rotation/RotationVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Rotation
     [UsedImplicitly]
     public sealed class RotationVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Security/DeployableBarrierVisualizer.cs b/Content.Client/Security/DeployableBarrierVisualizer.cs
index f77a9230f5..6779d68c6b 100644
--- a/Content.Client/Security/DeployableBarrierVisualizer.cs
+++ b/Content.Client/Security/DeployableBarrierVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.Security
     [UsedImplicitly]
     public sealed class DeployableBarrierVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Shuttles/ThrusterVisualizer.cs b/Content.Client/Shuttles/ThrusterVisualizer.cs
index 5f7712450a..3e56ef4c0d 100644
--- a/Content.Client/Shuttles/ThrusterVisualizer.cs
+++ b/Content.Client/Shuttles/ThrusterVisualizer.cs
@@ -7,6 +7,7 @@ namespace Content.Client.Shuttles
 {
     public sealed class ThrusterVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs b/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
index 3581b55f5a..f9c094641d 100644
--- a/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
@@ -14,6 +14,7 @@ namespace Content.Client.Singularity.Visualizers
         private const string OverlayBeam = "beam";
         private const string OverlayUnderPowered = "underpowered";
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
index 552190cb57..7410cff722 100644
--- a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
@@ -44,11 +44,13 @@ namespace Content.Client.Singularity.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
index a0b3145340..fa5c7cb333 100644
--- a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
@@ -14,6 +14,7 @@ namespace Content.Client.Singularity.Visualizers
         [DataField("layer")]
         private int Layer { get; } = 0;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -21,6 +22,7 @@ namespace Content.Client.Singularity.Visualizers
             IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity)?.LayerMapReserveBlank(Layer);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Smoking/BurnStateVisualizer.cs b/Content.Client/Smoking/BurnStateVisualizer.cs
index 6cc278863a..a67f156dde 100644
--- a/Content.Client/Smoking/BurnStateVisualizer.cs
+++ b/Content.Client/Smoking/BurnStateVisualizer.cs
@@ -25,6 +25,7 @@ namespace Content.Client.Smoking
             IoCManager.InjectDependencies(this);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Stack/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs
index e969a4bdaf..2bf1149136 100644
--- a/Content.Client/Stack/StackVisualizer.cs
+++ b/Content.Client/Stack/StackVisualizer.cs
@@ -78,6 +78,7 @@ namespace Content.Client.Stack
 
         [DataField("sprite")] private ResourcePath? _spritePath;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -97,6 +98,7 @@ namespace Content.Client.Stack
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
index a5f0007367..0199e3994f 100644
--- a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
@@ -24,6 +24,7 @@ namespace Content.Client.Storage.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -40,6 +41,7 @@ namespace Content.Client.Storage.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Storage/Visualizers/StorageVisualizer.cs b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
index 124d3843b8..c6b2f455df 100644
--- a/Content.Client/Storage/Visualizers/StorageVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
@@ -22,6 +22,7 @@ namespace Content.Client.Storage.Visualizers
         [DataField("state_closed")]
         private string? _stateClosed;
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
@@ -40,6 +41,7 @@ namespace Content.Client.Storage.Visualizers
             }
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
@@ -63,7 +65,7 @@ namespace Content.Client.Storage.Visualizers
                         sprite.LayerSetState(StorageVisualLayers.Door, _stateOpen);
                         sprite.LayerSetVisible(StorageVisualLayers.Door, true);
                     }
-                        
+
                     if (_stateBaseAlt != null)
                         sprite.LayerSetState(0, _stateBaseAlt);
                 }
diff --git a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs b/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
index deac525cda..6dd8de5f09 100644
--- a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
+++ b/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
@@ -10,6 +10,7 @@ namespace Content.Client.Tabletop.Visualizers
     [UsedImplicitly]
     public sealed class TabletopItemVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent appearance)
         {
             var entities = IoCManager.Resolve<IEntityManager>();
diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs
index ba26ef2479..961f38a6a3 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizer.cs
+++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs
@@ -35,11 +35,13 @@ namespace Content.Client.Trigger
             }
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
diff --git a/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
index 755a244cca..ca679a4a95 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
@@ -120,6 +120,7 @@ namespace Content.Client.VendingMachines.UI
             flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(key, 0f));
         }
 
+        [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
@@ -137,6 +138,7 @@ namespace Content.Client.VendingMachines.UI
             spriteComponent.LayerSetVisible(VendingMachineVisualLayers.Unlit, true);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Visualizer/FoldableVisualizer.cs b/Content.Client/Visualizer/FoldableVisualizer.cs
index 0e10f70b02..7a37eda6d2 100644
--- a/Content.Client/Visualizer/FoldableVisualizer.cs
+++ b/Content.Client/Visualizer/FoldableVisualizer.cs
@@ -12,6 +12,7 @@ public sealed class FoldableVisualizer : AppearanceVisualizer
     [DataField("key")]
     private string _key = default!;
 
+    [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
     public override void OnChangeData(AppearanceComponent appearance)
     {
         base.OnChangeData(appearance);
diff --git a/Content.Client/Visualizer/GenericEnumVisualizer.cs b/Content.Client/Visualizer/GenericEnumVisualizer.cs
index 95606ef675..d7f2c076ab 100644
--- a/Content.Client/Visualizer/GenericEnumVisualizer.cs
+++ b/Content.Client/Visualizer/GenericEnumVisualizer.cs
@@ -51,6 +51,7 @@ namespace Content.Client.Visualizer
             States = _statesRaw.ToDictionary(kvp => ResolveRef(kvp.Key), kvp => kvp.Value);
         }
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Visualizer/RollerbedVisualizer.cs b/Content.Client/Visualizer/RollerbedVisualizer.cs
index c93ae7ac6e..43783a2e4f 100644
--- a/Content.Client/Visualizer/RollerbedVisualizer.cs
+++ b/Content.Client/Visualizer/RollerbedVisualizer.cs
@@ -13,6 +13,7 @@ namespace Content.Client.Visualizer
         [DataField("key")]
         private string _key = default!;
 
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent appearance)
         {
             base.OnChangeData(appearance);
diff --git a/Content.Client/Wall/ReinforcedWallVisualizer.cs b/Content.Client/Wall/ReinforcedWallVisualizer.cs
index 9ee1660d79..fb2536dcc9 100644
--- a/Content.Client/Wall/ReinforcedWallVisualizer.cs
+++ b/Content.Client/Wall/ReinforcedWallVisualizer.cs
@@ -9,6 +9,7 @@ namespace Content.Client.Wall
     [UsedImplicitly]
     public sealed class ReinforcedWallVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Wires/Visualizers/WiresVisualizer.cs b/Content.Client/Wires/Visualizers/WiresVisualizer.cs
index f306c2aecd..0431735daf 100644
--- a/Content.Client/Wires/Visualizers/WiresVisualizer.cs
+++ b/Content.Client/Wires/Visualizers/WiresVisualizer.cs
@@ -7,6 +7,7 @@ namespace Content.Client.Wires.Visualizers
 {
     public sealed class WiresVisualizer : AppearanceVisualizer
     {
+        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
diff --git a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactVisualizer.cs b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactVisualizer.cs
index 9bbb56a851..3f7b3448ae 100644
--- a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactVisualizer.cs
+++ b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactVisualizer.cs
@@ -7,6 +7,7 @@ namespace Content.Client.Xenoarchaeology.XenoArtifacts;
 
 public sealed class RandomArtifactVisualizer : AppearanceVisualizer
 {
+    [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
     public override void OnChangeData(AppearanceComponent component)
     {
         base.OnChangeData(component);
diff --git a/Content.Server/Abilities/Boxer/BoxingSystem.cs b/Content.Server/Abilities/Boxer/BoxingSystem.cs
index a3a58a0619..22389ea309 100644
--- a/Content.Server/Abilities/Boxer/BoxingSystem.cs
+++ b/Content.Server/Abilities/Boxer/BoxingSystem.cs
@@ -14,8 +14,6 @@ namespace Content.Server.Abilities.Boxer
 {
     public sealed class BoxingSystem : EntitySystem
     {
-        [Dependency] private readonly StunSystem _stunSystem = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index eb9737b2aa..53b3aef0af 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Server.Access.Systems
 {
     public sealed class IdCardSystem : SharedIdCardSystem
     {
-        [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index f320da3de3..e6f219f32a 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Administration.Systems;
 
 public sealed partial class AdminVerbSystem
 {
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
     [Dependency] private readonly TraitorRuleSystem _traitorRule = default!;
     [Dependency] private readonly NukeopsRuleSystem _nukeopsRule = default!;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
index 66aa88d407..4be4d8271f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.EntitySystems
         public AtmosExposedGetAirEvent(EntityUid entity, bool invalidate = false)
         {
             Entity = entity;
-            invalidate = invalidate;
+            Invalidate = invalidate;
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
index 834794981c..082a811295 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
@@ -13,7 +13,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
     public sealed class GasPassiveGateSystem : EntitySystem
     {
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-        [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index 2c43a7dd8d..ca5239a138 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -24,7 +24,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly PricingSystem _pricing = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 08db5ede9d..e56134b837 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -36,7 +36,6 @@ namespace Content.Server.Chat.Managers
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private StationSystem _stationSystem = default!;
diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs
index 52b8b86483..8026c5ea46 100644
--- a/Content.Server/Cloning/CloningConsoleSystem.cs
+++ b/Content.Server/Cloning/CloningConsoleSystem.cs
@@ -24,7 +24,6 @@ namespace Content.Server.Cloning.Systems
     {
         [Dependency] private readonly SignalLinkerSystem _signalSystem = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly CloningSystem _cloningSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
diff --git a/Content.Server/Construction/AnchorableSystem.cs b/Content.Server/Construction/AnchorableSystem.cs
index 8172e5cab0..4e115dac3f 100644
--- a/Content.Server/Construction/AnchorableSystem.cs
+++ b/Content.Server/Construction/AnchorableSystem.cs
@@ -246,8 +246,6 @@ namespace Content.Server.Construction
         {
             public EntityUid User;
             public EntityUid Using;
-
-            public readonly TransformComponent Transform = default!;
         }
 
         private sealed class TryUnanchorCompletedEvent : AnchorEvent
diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 944fa26f1d..9ce621ae76 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -23,10 +23,8 @@ public sealed class CrewManifestSystem : EntitySystem
 {
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly StationRecordsSystem _recordsSystem = default!;
-    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly EuiManager _euiManager = default!;
     [Dependency] private readonly IConfigurationManager _configManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     /// <summary>
     ///     Cached crew manifest entries. The alternative is to outright
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index fc2015a2a0..41cde6f613 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -38,7 +38,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems
 {
     public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 7b420a0b45..81f50dbd8f 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -32,7 +32,6 @@ public sealed partial class ExplosionSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index e533f966a7..8cf8f2711a 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -32,7 +32,6 @@ public sealed class PiratesRuleSystem : GameRuleSystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawningSystem = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
     [Dependency] private readonly PricingSystem _pricingSystem = default!;
 
     [ViewVariables]
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index bf85019552..78473ee022 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -25,7 +25,6 @@ namespace Content.Server.Light.EntitySystems
     {
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PowerCellSystem _powerCell = default!;
-        [Dependency] private readonly ActionsSystem _actionSystem = default!;
         [Dependency] private readonly IPrototypeManager _proto = default!;
 
         // TODO: Ideally you'd be able to subscribe to power stuff to get events at certain percentages.. or something?
diff --git a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
index e8b0c19721..9ed5e14e44 100644
--- a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
+++ b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
@@ -17,10 +17,9 @@ namespace Content.Server.Medical
 {
     public sealed class StethoscopeSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
diff --git a/Content.Server/Mousetrap/MousetrapSystem.cs b/Content.Server/Mousetrap/MousetrapSystem.cs
index 27d9db4fbc..3d32130433 100644
--- a/Content.Server/Mousetrap/MousetrapSystem.cs
+++ b/Content.Server/Mousetrap/MousetrapSystem.cs
@@ -12,8 +12,6 @@ namespace Content.Server.Mousetrap;
 
 public sealed class MousetrapSystem : EntitySystem
 {
-    [Dependency] private readonly InventorySystem _inventorySystem = default!;
-    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
 
     public override void Initialize()
diff --git a/Content.Server/Nuke/NukeCodeSystem.cs b/Content.Server/Nuke/NukeCodeSystem.cs
index 8c478cff3e..ff08006849 100644
--- a/Content.Server/Nuke/NukeCodeSystem.cs
+++ b/Content.Server/Nuke/NukeCodeSystem.cs
@@ -15,7 +15,6 @@ namespace Content.Server.Nuke
     {
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ChatSystem _chatSystem = default!;
-        [Dependency] private readonly StationSystem _stationSystem = default!;
 
         private const int CodeLength = 6;
         public string Code { get; private set; } = default!;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index ea08d1ba4c..38a5d3270f 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -454,7 +454,6 @@ public sealed partial class ShuttleSystem
 
         var xformQuery = GetEntityQuery<TransformComponent>();
         var shuttleAABB = Comp<IMapGridComponent>(component.Owner).Grid.LocalAABB;
-        Box2? aabb = null;
 
         // Spawn nearby.
         // We essentially expand the Box2 of the target area until nothing else is added then we know it's valid.
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index 4a921b2ce5..d5e1c3426e 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -19,7 +19,6 @@ namespace Content.Server.Singularity.EntitySystems
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
         [Dependency] private readonly PVSOverrideSystem _pvs = default!;
-        [Dependency] private readonly ContainmentFieldGeneratorSystem _fieldGeneratorSystem = default!;
         /// <summary>
         /// How much energy the singulo gains from destroying a tile.
         /// </summary>
@@ -131,7 +130,7 @@ namespace Content.Server.Singularity.EntitySystems
             return entity != component.Owner &&
                    !EntityManager.HasComponent<IMapGridComponent>(entity) &&
                    !EntityManager.HasComponent<GhostComponent>(entity) &&
-                   !EntityManager.HasComponent<StationDataComponent>(entity) && // these SHOULD be in null-space... but just in case. Also, maybe someone moves a singularity there.. 
+                   !EntityManager.HasComponent<StationDataComponent>(entity) && // these SHOULD be in null-space... but just in case. Also, maybe someone moves a singularity there..
                    (component.Level > 4 ||
                    !EntityManager.HasComponent<ContainmentFieldComponent>(entity) &&
                    !EntityManager.HasComponent<ContainmentFieldGeneratorComponent>(entity));
diff --git a/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
index 4f942338c2..161bcb7245 100644
--- a/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
+++ b/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Weapon.Ranged.Systems;
 
 public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
 
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index e5c0e43268..3022070f48 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -20,7 +20,6 @@ namespace Content.Server.Zombies
 {
     public sealed class ZombieSystem : EntitySystem
     {
-        [Dependency] private readonly DamageableSystem _damage = default!;
         [Dependency] private readonly DiseaseSystem _disease = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
         [Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs
index 2141d056ce..c7e7299926 100644
--- a/Content.Shared/Decals/SharedDecalSystem.cs
+++ b/Content.Shared/Decals/SharedDecalSystem.cs
@@ -10,7 +10,6 @@ namespace Content.Shared.Decals
     public abstract class SharedDecalSystem : EntitySystem
     {
         [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] protected readonly IMapManager MapManager = default!;
 
         protected readonly Dictionary<EntityUid, Dictionary<uint, Vector2i>> ChunkIndex = new();
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index a721f972fd..c3800febc9 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -46,7 +46,6 @@ namespace Content.Shared.Interaction
         [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly UseDelaySystem _useDelay = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
         [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
 
         private const CollisionGroup InRangeUnobstructedMask
@@ -607,7 +606,7 @@ namespace Content.Shared.Interaction
         /// Finds components with the InteractUsing interface and calls their function
         /// NOTE: Does not have an InRangeUnobstructed check
         /// </summary>
-        public async void InteractUsing(
+        public void InteractUsing(
             EntityUid user,
             EntityUid used,
             EntityUid target,
@@ -636,7 +635,7 @@ namespace Content.Shared.Interaction
         /// <summary>
         ///     Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions.
         /// </summary>
-        public async void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
+        public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
         {
             if (target is {Valid: false})
                 target = null;
diff --git a/Content.Shared/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs
index d7ece717be..14c4123c6a 100644
--- a/Content.Shared/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/Storage/SharedStorageComponent.cs
@@ -43,7 +43,6 @@ namespace Content.Shared.Storage
             Key,
         }
 
-        [Dependency] private readonly IEntityManager _entMan = default!;
         public abstract IReadOnlyList<EntityUid>? StoredEntities { get; }
 
         /// <summary>