diff --git a/DysonNetwork.Sphere/Account/AccountController.cs b/DysonNetwork.Sphere/Account/AccountController.cs
index 6e2d39ad..1e67bca6 100644
--- a/DysonNetwork.Sphere/Account/AccountController.cs
+++ b/DysonNetwork.Sphere/Account/AccountController.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using DysonNetwork.Sphere.Auth;
 using DysonNetwork.Sphere.Permission;
-using DysonNetwork.Sphere.Storage;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -15,11 +14,9 @@ namespace DysonNetwork.Sphere.Account;
 [Route("/accounts")]
 public class AccountController(
     AppDatabase db,
-    FileService fs,
     AuthService auth,
     AccountService accounts,
-    AccountEventService events,
-    MagicSpellService spells
+    AccountEventService events
 ) : ControllerBase
 {
     [HttpGet("{name}")]
diff --git a/DysonNetwork.Sphere/Account/NotificationService.cs b/DysonNetwork.Sphere/Account/NotificationService.cs
index a58b22c4..3b43cc01 100644
--- a/DysonNetwork.Sphere/Account/NotificationService.cs
+++ b/DysonNetwork.Sphere/Account/NotificationService.cs
@@ -10,7 +10,6 @@ namespace DysonNetwork.Sphere.Account;
 public class NotificationService(
     AppDatabase db,
     WebSocketService ws,
-    ILogger<NotificationService> logger,
     IHttpClientFactory httpFactory,
     IConfiguration config)
 {
diff --git a/DysonNetwork.Sphere/Auth/AuthService.cs b/DysonNetwork.Sphere/Auth/AuthService.cs
index a41e48bf..c4ba1504 100644
--- a/DysonNetwork.Sphere/Auth/AuthService.cs
+++ b/DysonNetwork.Sphere/Auth/AuthService.cs
@@ -58,7 +58,7 @@ public class AuthService(AppDatabase db, IConfiguration config, IHttpClientFacto
 
         // 4) Combine base “maxSteps” (the number of enabled factors) with any accumulated risk score.
         const int totalRiskScore = 3;
-        var totalRequiredSteps = (int)Math.Round((float)maxSteps * riskScore / 3);
+        var totalRequiredSteps = (int)Math.Round((float)maxSteps * riskScore / totalRiskScore);
         // Clamp the steps
         totalRequiredSteps = Math.Max(Math.Min(totalRequiredSteps, maxSteps), 1);
 
diff --git a/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs b/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs
index a0ced21a..f432458c 100644
--- a/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs
+++ b/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs
@@ -304,7 +304,7 @@ public class ConnectionController(
         {
             await db.SaveChangesAsync();
         }
-        catch (DbUpdateException ex)
+        catch (DbUpdateException)
         {
             return StatusCode(500, $"Failed to save {provider} connection. Please try again.");
         }
diff --git a/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs b/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs
index c1b73660..fccdc367 100644
--- a/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs
+++ b/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs
@@ -33,15 +33,15 @@ public class DiscordOidcService(
         return $"https://discord.com/api/oauth2/authorize?{queryString}";
     }
     
-    protected override async Task<OidcDiscoveryDocument?> GetDiscoveryDocumentAsync()
+    protected override Task<OidcDiscoveryDocument?> GetDiscoveryDocumentAsync()
     {
-        return new OidcDiscoveryDocument
+        return Task.FromResult(new OidcDiscoveryDocument
         {
             AuthorizationEndpoint = "https://discord.com/oauth2/authorize",
             TokenEndpoint = "https://discord.com/api/oauth2/token",
             UserinfoEndpoint = "https://discord.com/api/users/@me",
             JwksUri = null
-        };
+        })!;
     }
     
     public override async Task<OidcUserInfo> ProcessCallbackAsync(OidcCallbackData callbackData)
diff --git a/DysonNetwork.Sphere/Chat/ChatRoomController.cs b/DysonNetwork.Sphere/Chat/ChatRoomController.cs
index b1b7694e..3ab72ab5 100644
--- a/DysonNetwork.Sphere/Chat/ChatRoomController.cs
+++ b/DysonNetwork.Sphere/Chat/ChatRoomController.cs
@@ -16,7 +16,6 @@ namespace DysonNetwork.Sphere.Chat;
 [Route("/chat")]
 public class ChatRoomController(
     AppDatabase db,
-    FileService fs,
     FileReferenceService fileRefService,
     ChatRoomService crs,
     RealmService rs,
diff --git a/DysonNetwork.Sphere/Chat/ChatService.cs b/DysonNetwork.Sphere/Chat/ChatService.cs
index b14d7fbb..f893d11c 100644
--- a/DysonNetwork.Sphere/Chat/ChatService.cs
+++ b/DysonNetwork.Sphere/Chat/ChatService.cs
@@ -9,7 +9,6 @@ namespace DysonNetwork.Sphere.Chat;
 
 public class ChatService(
     AppDatabase db,
-    FileService fs,
     FileReferenceService fileRefService,
     IServiceScopeFactory scopeFactory,
     IRealtimeService realtime,
diff --git a/DysonNetwork.Sphere/Publisher/PublisherController.cs b/DysonNetwork.Sphere/Publisher/PublisherController.cs
index d03e9c4b..137e9663 100644
--- a/DysonNetwork.Sphere/Publisher/PublisherController.cs
+++ b/DysonNetwork.Sphere/Publisher/PublisherController.cs
@@ -16,7 +16,6 @@ namespace DysonNetwork.Sphere.Publisher;
 public class PublisherController(
     AppDatabase db,
     PublisherService ps,
-    FileService fs,
     FileReferenceService fileRefService,
     ActionLogService als)
     : ControllerBase
diff --git a/DysonNetwork.Sphere/Publisher/PublisherService.cs b/DysonNetwork.Sphere/Publisher/PublisherService.cs
index 65119efa..5de97df2 100644
--- a/DysonNetwork.Sphere/Publisher/PublisherService.cs
+++ b/DysonNetwork.Sphere/Publisher/PublisherService.cs
@@ -6,7 +6,7 @@ using NodaTime;
 
 namespace DysonNetwork.Sphere.Publisher;
 
-public class PublisherService(AppDatabase db, FileService fs, FileReferenceService fileRefService, ICacheService cache)
+public class PublisherService(AppDatabase db, FileReferenceService fileRefService, ICacheService cache)
 {
     private const string UserPublishersCacheKey = "accounts:{0}:publishers";
 
diff --git a/DysonNetwork.Sphere/Realm/RealmController.cs b/DysonNetwork.Sphere/Realm/RealmController.cs
index a22f944c..82997eed 100644
--- a/DysonNetwork.Sphere/Realm/RealmController.cs
+++ b/DysonNetwork.Sphere/Realm/RealmController.cs
@@ -13,7 +13,6 @@ namespace DysonNetwork.Sphere.Realm;
 public class RealmController(
     AppDatabase db,
     RealmService rs,
-    FileService fs,
     FileReferenceService fileRefService,
     RelationshipService rels,
     ActionLogService als
diff --git a/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs b/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs
index 3a46c5c7..6b97a068 100644
--- a/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs
+++ b/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs
@@ -6,7 +6,6 @@ namespace DysonNetwork.Sphere.Storage;
 
 public class CloudFileUnusedRecyclingJob(
     AppDatabase db,
-    FileService fs,
     FileReferenceService fileRefService,
     ILogger<CloudFileUnusedRecyclingJob> logger
 )
diff --git a/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs b/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs
index 8073df61..9546c03d 100644
--- a/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs
+++ b/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs
@@ -6,8 +6,8 @@ namespace DysonNetwork.Sphere.Storage.Handlers;
 
 public class LastActiveInfo
 {
-    public Auth.Session Session { get; set; }
-    public Account.Account Account { get; set; }
+    public Auth.Session Session { get; set; } = null!;
+    public Account.Account Account { get; set; } = null!;
     public Instant SeenAt { get; set; }
 }