diff --git a/lang/Jailbreak.English/RTD/RTDLocale.cs b/lang/Jailbreak.English/RTD/RTDLocale.cs
index 1f81158..634a05f 100644
--- a/lang/Jailbreak.English/RTD/RTDLocale.cs
+++ b/lang/Jailbreak.English/RTD/RTDLocale.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
 using Jailbreak.Formatting.Logistics;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.RTD;
 using Jailbreak.Public.Mod.RTD;
 
diff --git a/mod/Gangs.BaseImpl/BasePerk.cs b/mod/Gangs.BaseImpl/BasePerk.cs
index 27576d3..cd31520 100644
--- a/mod/Gangs.BaseImpl/BasePerk.cs
+++ b/mod/Gangs.BaseImpl/BasePerk.cs
@@ -12,7 +12,7 @@ public abstract class BasePerk : BaseStat, IPerk {
 }
 
 public abstract class BasePerk<TV>(IServiceProvider provider)
-  : BasePerk(), IPerk, IStat<TV> {
+  : BasePerk, IPerk, IStat<TV> {
   protected IServiceProvider Provider { get; } = provider;
   public override Type ValueType => typeof(TV);
   public abstract TV Value { get; set; }
diff --git a/mod/Gangs.BombIconPerk/BombIconBootstrap.cs b/mod/Gangs.BombIconPerk/BombIconBootstrap.cs
index 134b3f2..0987cb4 100644
--- a/mod/Gangs.BombIconPerk/BombIconBootstrap.cs
+++ b/mod/Gangs.BombIconPerk/BombIconBootstrap.cs
@@ -6,7 +6,7 @@ namespace Gangs.BombIconPerk;
 
 public class BombIconBootstrap {
   public BombIconBootstrap(IServiceProvider collection, BasePlugin plugin) {
-    new BombIconCommand(collection, plugin).Start();
+    new BombIconCommand(collection).Start();
     collection.GetRequiredService<IPerkManager>()
      .Perks.Add(new BombPerk(collection));
   }
diff --git a/mod/Gangs.BombIconPerk/BombIconCommand.cs b/mod/Gangs.BombIconPerk/BombIconCommand.cs
index 9c218e0..eef0b1d 100644
--- a/mod/Gangs.BombIconPerk/BombIconCommand.cs
+++ b/mod/Gangs.BombIconPerk/BombIconCommand.cs
@@ -1,7 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Commands;
-using GangsAPI;
+using GangsAPI;
 using GangsAPI.Data;
 using GangsAPI.Data.Command;
 using GangsAPI.Exceptions;
@@ -15,12 +12,13 @@
 using GangsAPI.Services.Player;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 
 namespace Gangs.BombIconPerk;
 
-public class BombIconCommand(IServiceProvider provider, BasePlugin plugin)
-  : ICommand {
+public class BombIconCommand(IServiceProvider provider) : ICommand {
+  private readonly ICommandManager commands =
+    provider.GetRequiredService<ICommandManager>();
+
   private readonly IEcoManager eco = provider.GetRequiredService<IEcoManager>();
 
   private readonly IGangChatPerk? gangChat =
@@ -44,9 +42,6 @@ public class BombIconCommand(IServiceProvider provider, BasePlugin plugin)
   private readonly IRankManager ranks =
     provider.GetRequiredService<IRankManager>();
 
-  private readonly ICommandManager commands =
-    provider.GetRequiredService<ICommandManager>();
-
   public string Name => "css_bombicon";
   public string[] Usage => ["<icon>"];
 
diff --git a/mod/Gangs.BombIconPerk/BombIconMenu.cs b/mod/Gangs.BombIconPerk/BombIconMenu.cs
index dadc5e5..023d70a 100644
--- a/mod/Gangs.BombIconPerk/BombIconMenu.cs
+++ b/mod/Gangs.BombIconPerk/BombIconMenu.cs
@@ -1,18 +1,15 @@
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Utils;
 using GangsAPI.Data;
-using GangsAPI.Exceptions;
 using GangsAPI.Extensions;
+using GangsAPI.Menu;
 using GangsAPI.Services.Commands;
-using GangsAPI.Services.Gang;
-using GangsAPI.Services.Menu;
-using Menu;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Gangs.BombIconPerk;
 
 public class BombIconMenu(IServiceProvider provider, BombPerkData data)
-  : AbstractPagedMenu<BombIcon>(provider, NativeSenders.Chat, 7) {
+  : AbstractPagedMenu<BombIcon>(provider, NativeSenders.Chat) {
   private readonly ICommandManager commands =
     provider.GetRequiredService<ICommandManager>();
 
diff --git a/mod/Gangs.BombIconPerk/BombPerk.cs b/mod/Gangs.BombIconPerk/BombPerk.cs
index f05d05d..4da1053 100644
--- a/mod/Gangs.BombIconPerk/BombPerk.cs
+++ b/mod/Gangs.BombIconPerk/BombPerk.cs
@@ -10,12 +10,13 @@ namespace Gangs.BombIconPerk;
 public class BombPerk(IServiceProvider provider)
   : BasePerk<BombPerkData>(provider) {
   public const string STAT_ID = "jb_bomb_icon";
-  public override string StatId => STAT_ID;
-  public override string Name => "Bomb Icon";
 
   private readonly IGangStatManager gangStats =
     provider.GetRequiredService<IGangStatManager>();
 
+  public override string StatId => STAT_ID;
+  public override string Name => "Bomb Icon";
+
   public override string? Description
     => "Customize the icon that is shown when you bomb a CT";
 
diff --git a/mod/Gangs.Boostrap/GangsServiceExtension.cs b/mod/Gangs.Boostrap/GangsServiceExtension.cs
index 8822200..0a2323f 100644
--- a/mod/Gangs.Boostrap/GangsServiceExtension.cs
+++ b/mod/Gangs.Boostrap/GangsServiceExtension.cs
@@ -1,11 +1,9 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using Gangs.BombIconPerk;
 using Jailbreak.Public;
 using Jailbreak.Public.Behaviors;
 using Jailbreak.Public.Extensions;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Gangs.Boostrap;
 
diff --git a/mod/Jailbreak.LastRequest/Jailbreak.LastRequest.csproj b/mod/Jailbreak.LastRequest/Jailbreak.LastRequest.csproj
index e72b61d..7983d67 100644
--- a/mod/Jailbreak.LastRequest/Jailbreak.LastRequest.csproj
+++ b/mod/Jailbreak.LastRequest/Jailbreak.LastRequest.csproj
@@ -13,7 +13,7 @@
 
     <ItemGroup>
         <Reference Include="GangsAPI">
-          <HintPath>..\..\public\Jailbreak.Public\Mixin\GangsAPI.dll</HintPath>
+            <HintPath>..\..\public\Jailbreak.Public\Mixin\GangsAPI.dll</HintPath>
         </Reference>
         <Reference Include="MStatsShared">
             <HintPath>..\..\public\Jailbreak.Public\Mixin\MStatsShared.dll</HintPath>
diff --git a/mod/Jailbreak.RTD/Rewards/CannotScope.cs b/mod/Jailbreak.RTD/Rewards/CannotScope.cs
index 8621ceb..356a13c 100644
--- a/mod/Jailbreak.RTD/Rewards/CannotScope.cs
+++ b/mod/Jailbreak.RTD/Rewards/CannotScope.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using Jailbreak.Public.Extensions;
-using Jailbreak.Public.Mod.RTD;
 
 namespace Jailbreak.RTD.Rewards;
 
diff --git a/mod/Jailbreak.Rebel/C4Bomb/C4Behavior.cs b/mod/Jailbreak.Rebel/C4Bomb/C4Behavior.cs
index 480e22f..bfacd76 100644
--- a/mod/Jailbreak.Rebel/C4Bomb/C4Behavior.cs
+++ b/mod/Jailbreak.Rebel/C4Bomb/C4Behavior.cs
@@ -41,6 +41,8 @@ public class C4Behavior(IC4Locale ic4Locale, IRebelService rebelService)
 
   private readonly Dictionary<CC4, C4Metadata> bombs = new();
 
+  private readonly Dictionary<ulong, string> cachedBombIcons = new();
+
   // EmitSound(CBaseEntity* pEnt, const char* sSoundName, int nPitch, float flVolume, float flDelay)
   private readonly MemoryFunctionVoid<CBaseEntity, string, int, float, float>
     // ReSharper disable once InconsistentNaming
@@ -49,8 +51,6 @@ private readonly MemoryFunctionVoid<CBaseEntity, string, int, float, float>
 
   private readonly Dictionary<int, int> deathToKiller = new();
 
-  private readonly Dictionary<ulong, string> cachedBombIcons = new();
-
   private bool giveNextRound = true;
 
   private BasePlugin? plugin;
diff --git a/mod/Jailbreak.Rebel/Jailbreak.Rebel.csproj b/mod/Jailbreak.Rebel/Jailbreak.Rebel.csproj
index e17ac1d..54c3bb9 100644
--- a/mod/Jailbreak.Rebel/Jailbreak.Rebel.csproj
+++ b/mod/Jailbreak.Rebel/Jailbreak.Rebel.csproj
@@ -9,12 +9,12 @@
     <ItemGroup>
         <ProjectReference Include="..\..\public\Jailbreak.Formatting\Jailbreak.Formatting.csproj"/>
         <ProjectReference Include="..\..\public\Jailbreak.Public\Jailbreak.Public.csproj"/>
-        <ProjectReference Include="..\Gangs.BombIconPerk\Gangs.BombIconPerk.csproj" />
+        <ProjectReference Include="..\Gangs.BombIconPerk\Gangs.BombIconPerk.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
         <Reference Include="GangsAPI">
-          <HintPath>..\..\public\Jailbreak.Public\Mixin\GangsAPI.dll</HintPath>
+            <HintPath>..\..\public\Jailbreak.Public\Mixin\GangsAPI.dll</HintPath>
         </Reference>
         <Reference Include="MStatsShared">
             <HintPath>..\..\public\Jailbreak.Public\Mixin\MStatsShared.dll</HintPath>
diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs
index 3efd52b..67ed110 100644
--- a/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs
+++ b/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs
@@ -56,8 +56,8 @@ public class HideAndSeekDay(BasePlugin plugin, IServiceProvider provider)
   public static readonly FakeConVar<string> CV_GUARD_WEAPONS = new(
     "jb_sd_hns_weapons_ct",
     "List of weapons/items CTs may use, empty for no restrictions",
-    string.Join(",", Tag.PISTOLS.Union(Tag.UTILITY)),
-    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
+    string.Join(",", Tag.PISTOLS.Union(Tag.UTILITY)), ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_PRISONER_WEAPONS = new(
     "jb_sd_hns_weapons_t",
diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs
index 713138a..fa2d24a 100644
--- a/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs
+++ b/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs
@@ -24,9 +24,8 @@ public class NoScopeDay(BasePlugin plugin, IServiceProvider provider)
     "jb_sd_noscope_allowedweapons",
     "Weapons to allow players to use, empty for no restrictions",
     string.Join(",",
-      Tag.UTILITY.Union(new[] { "weapon_ssg08", "weapon_knife" }
-       .ToHashSet())), ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+      Tag.UTILITY.Union(new[] { "weapon_ssg08", "weapon_knife" }.ToHashSet())),
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<int> CV_KNIFE_DELAY = new(
     "jb_sd_noscope_knife_delay",
diff --git a/public/Jailbreak.Public/Mixin/GangsAPI.dll b/public/Jailbreak.Public/Mixin/GangsAPI.dll
index a41cd42..58bc205 100644
Binary files a/public/Jailbreak.Public/Mixin/GangsAPI.dll and b/public/Jailbreak.Public/Mixin/GangsAPI.dll differ