diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index f34124b893..91ad2d97e9 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -47,7 +47,6 @@ namespace Content.Client
         [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner = default!;
         [Dependency] private readonly IGameController _gameController = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         public override void Init()
         {
diff --git a/Content.Server/Atmos/HighPressureMovementController.cs b/Content.Server/Atmos/HighPressureMovementController.cs
index b112e4619e..c344a25496 100644
--- a/Content.Server/Atmos/HighPressureMovementController.cs
+++ b/Content.Server/Atmos/HighPressureMovementController.cs
@@ -17,7 +17,6 @@ namespace Content.Server.Atmos
     public class HighPressureMovementController : FrictionController
     {
         [Dependency] private IRobustRandom _robustRandom = default!;
-        [Dependency] private IPhysicsManager _physicsManager = default!;
         public override IPhysicsComponent? ControlledComponent { protected get; set; }
 
         private const float MoveForcePushRatio = 1f;
diff --git a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
index 7962b56eab..d03ebafe81 100644
--- a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
@@ -43,7 +43,6 @@ namespace Content.Server.GameObjects.Components.Atmos
 
         private int _integrity = 3;
 
-        [Dependency] private readonly IEntityManager _entityManager = default!;
         [ViewVariables] private BoundUserInterface? _userInterface;
 
         [ViewVariables] public GasMixture? Air { get; set; }
diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
index 6c1e59a228..91521563c3 100644
--- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
+++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
@@ -20,7 +20,6 @@ namespace Content.Server.GameObjects.Components.Damage
     public class DestructibleComponent : RuinableComponent, IDestroyAct
     {
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
 
         protected ActSystem ActSystem;
diff --git a/Content.Server/GameObjects/Components/Damage/RuinableComponent.cs b/Content.Server/GameObjects/Components/Damage/RuinableComponent.cs
index c77c374777..bcdf22f8d0 100644
--- a/Content.Server/GameObjects/Components/Damage/RuinableComponent.cs
+++ b/Content.Server/GameObjects/Components/Damage/RuinableComponent.cs
@@ -20,7 +20,6 @@ namespace Content.Server.GameObjects.Components.Damage
     [ComponentReference(typeof(IDamageableComponent))]
     public abstract class RuinableComponent : DamageableComponent
     {
-        [Dependency] private IRobustRandom _random = default!;
         /// <summary>
         ///     Sound played upon destruction.
         /// </summary>
diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs
index 92bf31aac9..c211d464fc 100644
--- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs
+++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs
@@ -27,7 +27,6 @@ namespace Content.Server.GameObjects.Components.Singularity
     public class ContainmentFieldGeneratorComponent : Component, ICollideBehavior
     {
         [Dependency] private IPhysicsManager _physicsManager = null!;
-        [Dependency] private IEntityManager _entityManager = null!;
 
         public override string Name => "ContainmentFieldGenerator";
 
diff --git a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
index 75a4353ad1..825a82897d 100644
--- a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
+++ b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
@@ -38,8 +38,8 @@ namespace Content.Server.GameObjects.Components.Singularity
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
 
-        [ComponentDependency] private AppearanceComponent? _appearance;
-        [ComponentDependency] private AccessReader? _accessReader;
+        [ComponentDependency] private AppearanceComponent? _appearance = default;
+        [ComponentDependency] private AccessReader? _accessReader = default;
 
         public override string Name => "Emitter";
 
diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs
index 10ffcb51fe..2febf0c44b 100644
--- a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs
+++ b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs
@@ -30,7 +30,6 @@ namespace Content.Server.GameObjects.Components.Singularity
     public class SingularityComponent : Component, ICollideBehavior
     {
         [Dependency] private IEntityManager _entityManager = null!;
-        [Dependency] private IMapManager _mapManager = null!;
         [Dependency] private IRobustRandom _random = null!;
 
 
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
index 5bf8a1d419..83e3766405 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
@@ -39,7 +39,6 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
          */
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private PathfindingSystem _pathfindingSystem;
 
@@ -717,7 +716,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
 
                     foreach (var node in region.Nodes)
                     {
-                        var nodeVector = grid.GridTileToLocal(node.TileRef.GridIndices).ToMapPos(_entityManager);
+                        var nodeVector = grid.GridTileToLocal(node.TileRef.GridIndices).ToMapPos(EntityManager);
                         debugRegionNodes.Add(nodeVector);
                     }
 
@@ -746,7 +745,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
 
                 foreach (var node in region.Nodes)
                 {
-                    var nodeVector = grid.GridTileToLocal(node.TileRef.GridIndices).ToMapPos(_entityManager);
+                    var nodeVector = grid.GridTileToLocal(node.TileRef.GridIndices).ToMapPos(EntityManager);
 
                     debugResult[_runningCacheIdx].Add(nodeVector);
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
index f7aa32d3e2..d934f373ed 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
@@ -11,7 +11,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
 {
     public class AStarPathfindingJob : Job<Queue<TileRef>>
     {
+#if DEBUG
         public static event Action<SharedAiDebug.AStarRouteDebug> DebugRoute;
+#endif
 
         private PathfindingNode _startNode;
         private PathfindingNode _endNode;
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
index b1a7d62a48..a426caeb9a 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
@@ -15,7 +15,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
     {
         // Some of this is probably fugly due to other structural changes in pathfinding so it could do with optimisation
         // Realistically it's probably not getting used given it doesn't support tile costs which can be very useful
+#if DEBUG
         public static event Action<SharedAiDebug.JpsRouteDebug> DebugRoute;
+#endif
 
         private PathfindingNode _startNode;
         private PathfindingNode _endNode;
diff --git a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
index 6227dedc4e..65f058c934 100644
--- a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
@@ -17,7 +17,6 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         [Dependency] private readonly IComponentManager _componentManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         private int _nextUid = 0;
         private readonly Dictionary<int, Seed> _seeds = new Dictionary<int,Seed>();
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
index a1cb02fe6a..8d59168e75 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
@@ -23,7 +23,6 @@ namespace Content.Shared.GameObjects.EntitySystems
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] protected readonly IPhysicsManager PhysicsManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Shared/Physics/ThrowKnockbackController.cs b/Content.Shared/Physics/ThrowKnockbackController.cs
index e1cae0ee3b..d6bf507174 100644
--- a/Content.Shared/Physics/ThrowKnockbackController.cs
+++ b/Content.Shared/Physics/ThrowKnockbackController.cs
@@ -9,8 +9,6 @@ namespace Content.Shared.Physics
 {
     public class ThrowKnockbackController : VirtualController
     {
-        [Dependency] private readonly IPhysicsManager _physicsManager = default!;
-
         public ThrowKnockbackController()
         {
             IoCManager.InjectDependencies(this);