diff --git a/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs b/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs
index 3b3ed110..73bb4737 100644
--- a/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs
+++ b/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;
diff --git a/lang/Jailbreak.English/SpecialDay/SDLocale.cs b/lang/Jailbreak.English/SpecialDay/SDLocale.cs
index fc471098..b6c88209 100644
--- a/lang/Jailbreak.English/SpecialDay/SDLocale.cs
+++ b/lang/Jailbreak.English/SpecialDay/SDLocale.cs
@@ -3,7 +3,6 @@
 using Jailbreak.Formatting.Core;
 using Jailbreak.Formatting.Logistics;
 using Jailbreak.Formatting.Objects;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;
diff --git a/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs b/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs
index 23b785ff..8d5ef5d9 100644
--- a/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs
+++ b/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs
@@ -1,5 +1,4 @@
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Utils;
 
diff --git a/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs b/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs
index 3e43777c..b3ec791a 100644
--- a/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs
+++ b/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;
diff --git a/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs b/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs
index d4c31aeb..54f09a74 100644
--- a/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs
+++ b/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs
@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Utils;
 
diff --git a/mod/Jailbreak.Debug/Subcommands/DebugZone.cs b/mod/Jailbreak.Debug/Subcommands/DebugZone.cs
index 77f3bb5f..68956aa6 100644
--- a/mod/Jailbreak.Debug/Subcommands/DebugZone.cs
+++ b/mod/Jailbreak.Debug/Subcommands/DebugZone.cs
@@ -48,7 +48,7 @@ public override void OnCommand(CCSPlayerController? executor,
       specifiedType = success;
     }
 
-    string? map = Server.MapName;
+    string map = Server.MapName;
     switch (info.GetArg(1).ToLower()) {
       case "finish":
       case "done":
@@ -77,7 +77,7 @@ public override void OnCommand(CCSPlayerController? executor,
         var zoneCount = 0;
         foreach (var type in Enum.GetValues<ZoneType>()) {
           if (specifiedType != null && type != specifiedType) continue;
-          var displayZones = zoneManager.GetZones(Server.MapName, type)
+          var displayZones = zoneManager.GetZones(map, type)
            .GetAwaiter()
            .GetResult();
           foreach (var z in displayZones) z.Draw(plugin, type.GetColor(), 120);
@@ -102,7 +102,6 @@ public override void OnCommand(CCSPlayerController? executor,
       case "delete":
         var toDelete = getUniqueZone(executor, specifiedType);
         if (toDelete == null) return;
-        map = Server.MapName;
         Server.NextFrameAsync(async () => {
           await zoneManager.DeleteZone(toDelete.Value.Item1.Id, map);
           Server.NextFrame(() => {
@@ -116,9 +115,8 @@ public override void OnCommand(CCSPlayerController? executor,
         if (innerPair == null) return;
         var innerZone = innerPair.Value.Item1;
         innerZone.AddPoint(position);
-        map = Server.MapName;
         Server.NextFrameAsync(async () => {
-          await zoneManager.DeleteZone(innerZone.Id);
+          await zoneManager.DeleteZone(innerZone.Id, map);
           await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
             map);
           Server.NextFrame(() => {
@@ -159,7 +157,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
           return;
         }
 
-        var toList = zoneManager.GetZones(Server.MapName, specifiedType.Value)
+        var toList = zoneManager.GetZones(map, specifiedType.Value)
          .GetAwaiter()
          .GetResult();
         foreach (var listZone in toList)
@@ -169,7 +167,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
       case "cleanup":
         // Cleanup auto-generated zones
         // Remove spawns that are inside of any DO NOT TELEPORT zones
-        var spawns = zoneManager.GetZones(Server.MapName, ZoneType.SPAWN_AUTO)
+        var spawns = zoneManager.GetZones(map, ZoneType.SPAWN_AUTO)
          .GetAwaiter()
          .GetResult();
         if (spawns.Count == 0) {
@@ -193,7 +191,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
           + " auto-generated zones");
         Server.NextFrameAsync(async () => {
           foreach (var z in toRemove)
-            await zoneManager.DeleteZone(z.Id, Server.MapName);
+            await zoneManager.DeleteZone(z.Id, map);
         });
         return;
     }