diff --git a/src/Tgstation.Server.Host/Components/Chat/JsonTrackingContext.cs b/src/Tgstation.Server.Host/Components/Chat/JsonTrackingContext.cs
index 4fa03f5570..5aa1ea9201 100644
--- a/src/Tgstation.Server.Host/Components/Chat/JsonTrackingContext.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/JsonTrackingContext.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 96b71e5afa..8efb25659a 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -1,7 +1,6 @@
 using Byond.TopicSender;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -13,7 +12,6 @@ using Tgstation.Server.Api.Models.Internal;
 using Tgstation.Server.Api.Rights;
 using Tgstation.Server.Host.Components.Chat;
 using Tgstation.Server.Host.Components.Deployment;
-using Tgstation.Server.Host.Components.Interop;
 using Tgstation.Server.Host.Components.Interop.Topic;
 using Tgstation.Server.Host.Core;
 using Tgstation.Server.Host.Database;
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/INetworkPromptReaper.cs b/src/Tgstation.Server.Host/System/INetworkPromptReaper.cs
similarity index 84%
rename from src/Tgstation.Server.Host/Components/Watchdog/INetworkPromptReaper.cs
rename to src/Tgstation.Server.Host/System/INetworkPromptReaper.cs
index e26800ea37..7202932df5 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/INetworkPromptReaper.cs
+++ b/src/Tgstation.Server.Host/System/INetworkPromptReaper.cs
@@ -1,6 +1,4 @@
-using Tgstation.Server.Host.System;
-
-namespace Tgstation.Server.Host.Components.Watchdog
+namespace Tgstation.Server.Host.System
 {
 	/// <summary>
 	/// On Windows, DreamDaemon will show an unskippable prompt when using /world/proc/OpenPort(). This looks out for those prompts and immediately clicks "Yes" if the owning process has registered for it
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/PosixNetworkPromptReaper.cs b/src/Tgstation.Server.Host/System/PosixNetworkPromptReaper.cs
similarity index 71%
rename from src/Tgstation.Server.Host/Components/Watchdog/PosixNetworkPromptReaper.cs
rename to src/Tgstation.Server.Host/System/PosixNetworkPromptReaper.cs
index df0e4691f1..29c3d8427b 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/PosixNetworkPromptReaper.cs
+++ b/src/Tgstation.Server.Host/System/PosixNetworkPromptReaper.cs
@@ -1,6 +1,4 @@
-using Tgstation.Server.Host.System;
-
-namespace Tgstation.Server.Host.Components.Watchdog
+namespace Tgstation.Server.Host.System
 {
 	/// <inheritdoc />
 	sealed class PosixNetworkPromptReaper : INetworkPromptReaper
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WindowsNetworkPromptReaper.cs b/src/Tgstation.Server.Host/System/WindowsNetworkPromptReaper.cs
similarity index 98%
rename from src/Tgstation.Server.Host/Components/Watchdog/WindowsNetworkPromptReaper.cs
rename to src/Tgstation.Server.Host/System/WindowsNetworkPromptReaper.cs
index c83c74d49a..1586229119 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WindowsNetworkPromptReaper.cs
+++ b/src/Tgstation.Server.Host/System/WindowsNetworkPromptReaper.cs
@@ -9,9 +9,8 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.Core;
-using Tgstation.Server.Host.System;
 
-namespace Tgstation.Server.Host.Components.Watchdog
+namespace Tgstation.Server.Host.System
 {
 	/// <inheritdoc />
 	sealed class WindowsNetworkPromptReaper : IHostedService, INetworkPromptReaper, IDisposable