diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index e81975a3960..974b22fa06a 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Content.Server._DV.AccountLinking;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 4662062ea84..e0a62a68b4b 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -8,7 +8,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
-using Content.Shared._DV.AccountLinking;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Database;
@@ -17,7 +16,7 @@ using Content.Shared.Humanoid.Markings;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.Traits;
+//using Content.Shared.Traits; // DV - Traits
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
@@ -1927,7 +1926,7 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
         }
         #endregion
 
-        // BEGIN - DeltaV - Discord/Patreon Linking
+        // BEGIN DeltaV - Discord/Patreon Linking
         #region DeltaV - Account Linking
 
         public async Task<Guid?> GetLinkingCode(Guid player)
diff --git a/Content.Shared/_DV/AccountLinking/RMCPatronListMsg.cs b/Content.Shared/_DV/AccountLinking/PatronListMsg.cs
similarity index 100%
rename from Content.Shared/_DV/AccountLinking/RMCPatronListMsg.cs
rename to Content.Shared/_DV/AccountLinking/PatronListMsg.cs
diff --git a/Content.Shared/_DV/AccountLinking/SharedRMCPatron.cs b/Content.Shared/_DV/AccountLinking/SharedPatron.cs
similarity index 100%
rename from Content.Shared/_DV/AccountLinking/SharedRMCPatron.cs
rename to Content.Shared/_DV/AccountLinking/SharedPatron.cs
diff --git a/Content.Shared/_DV/AccountLinking/SharedRMCPatronFull.cs b/Content.Shared/_DV/AccountLinking/SharedPatronFull.cs
similarity index 100%
rename from Content.Shared/_DV/AccountLinking/SharedRMCPatronFull.cs
rename to Content.Shared/_DV/AccountLinking/SharedPatronFull.cs
diff --git a/Content.Shared/_DV/AccountLinking/SharedRMCPatronTier.cs b/Content.Shared/_DV/AccountLinking/SharedPatronTier.cs
similarity index 100%
rename from Content.Shared/_DV/AccountLinking/SharedRMCPatronTier.cs
rename to Content.Shared/_DV/AccountLinking/SharedPatronTier.cs
diff --git a/Content.Shared/_DV/AccountLinking/SharedRMCLobbyMessage.cs b/Content.Shared/_DV/AccountLinking/SharedRMCLobbyMessage.cs
deleted file mode 100644
index 665dacad057..00000000000
--- a/Content.Shared/_DV/AccountLinking/SharedRMCLobbyMessage.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._DV.AccountLinking;
-
-[Serializable, NetSerializable]
-public sealed record SharedRMCLobbyMessage(string Message)
-{
-    public const int CharacterLimit = 40;
-}