diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs
index 9075ca4395..f6a7f4c624 100644
--- a/Content.Client/Construction/ConstructionPlacementHijack.cs
+++ b/Content.Client/Construction/ConstructionPlacementHijack.cs
@@ -36,7 +36,7 @@ namespace Content.Client.Construction
         }
 
         /// <inheritdoc />
-        public override bool HijackDeletion(IEntity entity)
+        public override bool HijackDeletion(EntityUid entity)
         {
             if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ConstructionGhostComponent? ghost))
             {
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index 6b9e2b8fe5..b26f4d609e 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -153,7 +153,7 @@ namespace Content.IntegrationTests.Tests.Body
             MapId mapId;
             IMapGrid grid = null;
             RespiratorComponent respirator = null;
-            IEntity human = null;
+            EntityUid human = null;
 
             var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml";
 
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index f36f6fe67b..f0c42f172b 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -36,7 +36,7 @@ namespace Content.IntegrationTests.Tests.Destructible
             var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
             var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
 
-            IEntity sDestructibleEntity = null; ;
+            EntityUid sDestructibleEntity = null; ;
             DamageableComponent sDamageableComponent = null;
             DestructibleComponent sDestructibleComponent = null;
             TestDestructibleListenerSystem sTestThresholdListenerSystem = null;
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index 2d06c780e7..ebfa220b9b 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -56,7 +56,7 @@ namespace Content.IntegrationTests.Tests.Doors
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
 
-            IEntity airlock = null;
+            EntityUid airlock = null;
             ServerDoorComponent doorComponent = null;
 
             server.Assert(() =>
@@ -121,8 +121,8 @@ namespace Content.IntegrationTests.Tests.Doors
             var entityManager = server.ResolveDependency<IEntityManager>();
 
             IPhysBody physBody = null;
-            IEntity physicsDummy = null;
-            IEntity airlock = null;
+            EntityUid physicsDummy = null;
+            EntityUid airlock = null;
             ServerDoorComponent doorComponent = null;
 
             var physicsDummyStartingX = -1;
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index f0f8288628..918f57abfd 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -37,7 +37,7 @@ namespace Content.IntegrationTests.Tests
 
             var prototypes = new List<EntityPrototype>();
             IMapGrid grid = default;
-            IEntity testEntity;
+            EntityUid testEntity;
 
             //Build up test environment
             server.Post(() =>
diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
index 09416d2049..9a09dd1623 100644
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -90,7 +90,7 @@ namespace Content.IntegrationTests.Tests.Fluids
             MapId sMapId = default;
             IMapGrid sGrid;
             GridId sGridId = default;
-            IEntity sGridEntity = null;
+            EntityUid sGridEntity = null;
             EntityCoordinates sCoordinates = default;
 
             // Spawn a paused map with one tile to spawn puddles on
diff --git a/Content.Server/Administration/Logs/Converters/EntityConverter.cs b/Content.Server/Administration/Logs/Converters/EntityConverter.cs
deleted file mode 100644
index b06a091891..0000000000
--- a/Content.Server/Administration/Logs/Converters/EntityConverter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Text.Json;
-using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-
-namespace Content.Server.Administration.Logs.Converters;
-
-[AdminLogConverter]
-public class EntityConverter : AdminLogConverter<IEntity>
-{
-    [Dependency] private readonly IEntityManager _entities = default!;
-
-    public override void Write(Utf8JsonWriter writer, IEntity value, JsonSerializerOptions options)
-    {
-        EntityUidConverter.Write(writer, value, options, _entities);
-    }
-}