diff --git a/.editorconfig b/.editorconfig
index 67dc70dff..9c2beed95 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -79,6 +79,9 @@ dotnet_diagnostic.CS0618.severity = suggestion
 # Obsolete warnings, this should be removed or changed to warning once we address some of the obsolete items.
 dotnet_diagnostic.CS0612.severity = suggestion
 
+# Remove unnecessary using directives https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005
+dotnet_diagnostic.IDE0005.severity = warning
+
 # CSharp code style settings:
 [*.cs]
 # Prefer "var" everywhere
diff --git a/Directory.Build.props b/Directory.Build.props
index 2e4c0d642..e37e45855 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,12 +1,13 @@
 <Project>
 
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
     <!--Current Version: -->
-		<Version>2022.6.0</Version>
-		<RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
+    <Version>2022.6.0</Version>
+    <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-	</PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
 
   <!--
     This section is for packages that we use multiple times throughout the solution
diff --git a/bitwarden_license/src/CommCore/Services/ProviderService.cs b/bitwarden_license/src/CommCore/Services/ProviderService.cs
index 85d074127..596de0e28 100644
--- a/bitwarden_license/src/CommCore/Services/ProviderService.cs
+++ b/bitwarden_license/src/CommCore/Services/ProviderService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/bitwarden_license/src/Sso/Controllers/AccountController.cs b/bitwarden_license/src/Sso/Controllers/AccountController.cs
index aef1517bb..fbbf3084d 100644
--- a/bitwarden_license/src/Sso/Controllers/AccountController.cs
+++ b/bitwarden_license/src/Sso/Controllers/AccountController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -23,10 +19,8 @@ using IdentityServer4.Extensions;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Sso.Controllers
 {
diff --git a/bitwarden_license/src/Sso/Controllers/HomeController.cs b/bitwarden_license/src/Sso/Controllers/HomeController.cs
index 771d93a00..5ce112fa4 100644
--- a/bitwarden_license/src/Sso/Controllers/HomeController.cs
+++ b/bitwarden_license/src/Sso/Controllers/HomeController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using Bit.Sso.Models;
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Authorization;
diff --git a/bitwarden_license/src/Sso/Controllers/InfoController.cs b/bitwarden_license/src/Sso/Controllers/InfoController.cs
index 7f3058ae9..d652e8cdd 100644
--- a/bitwarden_license/src/Sso/Controllers/InfoController.cs
+++ b/bitwarden_license/src/Sso/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Sso.Controllers
diff --git a/bitwarden_license/src/Sso/Controllers/MetadataController.cs b/bitwarden_license/src/Sso/Controllers/MetadataController.cs
index a114f8e82..dbf033e84 100644
--- a/bitwarden_license/src/Sso/Controllers/MetadataController.cs
+++ b/bitwarden_license/src/Sso/Controllers/MetadataController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Sso.Utilities;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
diff --git a/bitwarden_license/src/Sso/Models/ErrorViewModel.cs b/bitwarden_license/src/Sso/Models/ErrorViewModel.cs
index b1420e2c3..4c0ea8748 100644
--- a/bitwarden_license/src/Sso/Models/ErrorViewModel.cs
+++ b/bitwarden_license/src/Sso/Models/ErrorViewModel.cs
@@ -1,5 +1,4 @@
-using System;
-using IdentityServer4.Models;
+using IdentityServer4.Models;
 
 namespace Bit.Sso.Models
 {
diff --git a/bitwarden_license/src/Sso/Program.cs b/bitwarden_license/src/Sso/Program.cs
index 6b6a83d05..910f09332 100644
--- a/bitwarden_license/src/Sso/Program.cs
+++ b/bitwarden_license/src/Sso/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
 
diff --git a/bitwarden_license/src/Sso/Startup.cs b/bitwarden_license/src/Sso/Startup.cs
index 0f349846b..50ebdd498 100644
--- a/bitwarden_license/src/Sso/Startup.cs
+++ b/bitwarden_license/src/Sso/Startup.cs
@@ -1,17 +1,10 @@
-using System;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using Bit.Sso.Utilities;
 using IdentityServer4.Extensions;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Logging;
 using Stripe;
 
diff --git a/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs b/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs
index 886842720..93a6fd146 100644
--- a/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs
+++ b/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Text.RegularExpressions;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs b/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs
index 2aecd6f13..bd58fc612 100644
--- a/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs
+++ b/bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs
@@ -1,12 +1,9 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using IdentityServer4.Configuration;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using IdentityServer4.Validation;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Sso.Utilities
 {
diff --git a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs
index 5dd4669b9..5a7ab6523 100644
--- a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs
+++ b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Sustainsys.Saml2.AspNetCore2;
diff --git a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
index 99e970ac1..22f897998 100644
--- a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
+++ b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Security.Cryptography.X509Certificates;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
@@ -17,8 +12,6 @@ using IdentityServer4;
 using IdentityServer4.Infrastructure;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Sustainsys.Saml2.AspNetCore2;
diff --git a/bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs b/bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs
index 951be7378..8e23e1f07 100644
--- a/bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs
+++ b/bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs b/bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs
index ff3b257db..7deab5440 100644
--- a/bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs
+++ b/bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Microsoft.AspNetCore.Authentication;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs b/bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs
index 758629e75..e01ff7111 100644
--- a/bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs
+++ b/bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs b/bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs
index d13efd70b..9d4870bd7 100644
--- a/bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs
+++ b/bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs
@@ -1,11 +1,6 @@
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
+using System.IO.Compression;
 using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
-using Microsoft.AspNetCore.Http;
 using Sustainsys.Saml2;
 using Sustainsys.Saml2.AspNetCore2;
 
diff --git a/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs b/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs
index 2a9989118..444ed6c52 100644
--- a/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs
+++ b/bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Business.Sso;
+using Bit.Core.Business.Sso;
 using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
@@ -9,9 +7,6 @@ using Bit.Sso.Models;
 using IdentityServer4.Models;
 using IdentityServer4.ResponseHandling;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Sustainsys.Saml2.AspNetCore2;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs b/bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs
index 2013a44c4..4a39082f3 100644
--- a/bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs
+++ b/bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Sustainsys.Saml2.AspNetCore2;
 
 namespace Bit.Sso.Utilities
diff --git a/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs b/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs
index 9882e1b3e..67f7e433a 100644
--- a/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs
+++ b/bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.CommCore.Services;
+using Bit.CommCore.Services;
 using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
 using Bit.Core.Context;
 using Bit.Core.Entities;
diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
index 6f433797d..9a113538a 100644
--- a/src/Admin/Controllers/HomeController.cs
+++ b/src/Admin/Controllers/HomeController.cs
@@ -1,14 +1,9 @@
 using System.Diagnostics;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 using Bit.Admin.Models;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Bit.Admin.Controllers
diff --git a/src/Admin/Controllers/InfoController.cs b/src/Admin/Controllers/InfoController.cs
index e09f0a9f3..7f39da6ed 100644
--- a/src/Admin/Controllers/InfoController.cs
+++ b/src/Admin/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers
diff --git a/src/Admin/Controllers/LoginController.cs b/src/Admin/Controllers/LoginController.cs
index d3fc14862..a8e3e9dd0 100644
--- a/src/Admin/Controllers/LoginController.cs
+++ b/src/Admin/Controllers/LoginController.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Admin.Models;
+using Bit.Admin.Models;
 using Bit.Core.Identity;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Admin/Controllers/LogsController.cs b/src/Admin/Controllers/LogsController.cs
index 21f1fca81..feb1a91b2 100644
--- a/src/Admin/Controllers/LogsController.cs
+++ b/src/Admin/Controllers/LogsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Admin.Models;
+using Bit.Admin.Models;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index 6752fed89..eccc7ced6 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Admin.Models;
+using Bit.Admin.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
@@ -14,7 +10,6 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Admin.Controllers
 {
diff --git a/src/Admin/Controllers/ProvidersController.cs b/src/Admin/Controllers/ProvidersController.cs
index 6d6d55ca3..e0e448499 100644
--- a/src/Admin/Controllers/ProvidersController.cs
+++ b/src/Admin/Controllers/ProvidersController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Admin.Models;
+using Bit.Admin.Models;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs
index 07b2a6ed7..11871c3ce 100644
--- a/src/Admin/Controllers/ToolsController.cs
+++ b/src/Admin/Controllers/ToolsController.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Admin.Models;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
@@ -12,7 +6,6 @@ using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers
diff --git a/src/Admin/Controllers/UsersController.cs b/src/Admin/Controllers/UsersController.cs
index a7793cda3..e8ea2e0cd 100644
--- a/src/Admin/Controllers/UsersController.cs
+++ b/src/Admin/Controllers/UsersController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Admin.Models;
+using Bit.Admin.Models;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
diff --git a/src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs b/src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs
index 3211008bc..b0222d06f 100644
--- a/src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs
+++ b/src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Amazon;
+using Amazon;
 using Amazon.SQS;
 using Amazon.SQS.Model;
 using Bit.Core.Settings;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Admin.HostedServices
diff --git a/src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs b/src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs
index ba958136a..cd96f359a 100644
--- a/src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs
+++ b/src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Storage.Queues;
+using Azure.Storage.Queues;
 using Bit.Core.Settings;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Admin.HostedServices
diff --git a/src/Admin/HostedServices/AzureQueueMailHostedService.cs b/src/Admin/HostedServices/AzureQueueMailHostedService.cs
index 670e16615..6e976f0b7 100644
--- a/src/Admin/HostedServices/AzureQueueMailHostedService.cs
+++ b/src/Admin/HostedServices/AzureQueueMailHostedService.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Storage.Queues;
 using Azure.Storage.Queues.Models;
 using Bit.Core.Models.Mail;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Admin.HostedServices
 {
diff --git a/src/Admin/HostedServices/BlockIpHostedService.cs b/src/Admin/HostedServices/BlockIpHostedService.cs
index 672414430..17f0c50ce 100644
--- a/src/Admin/HostedServices/BlockIpHostedService.cs
+++ b/src/Admin/HostedServices/BlockIpHostedService.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+using Bit.Core.Settings;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Admin.HostedServices
diff --git a/src/Admin/HostedServices/DatabaseMigrationHostedService.cs b/src/Admin/HostedServices/DatabaseMigrationHostedService.cs
index c507be065..06cf01428 100644
--- a/src/Admin/HostedServices/DatabaseMigrationHostedService.cs
+++ b/src/Admin/HostedServices/DatabaseMigrationHostedService.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Data.SqlClient;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Data.SqlClient;
 using Bit.Core.Jobs;
 using Bit.Core.Settings;
 using Bit.Migrator;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Admin.HostedServices
 {
diff --git a/src/Admin/Jobs/AliveJob.cs b/src/Admin/Jobs/AliveJob.cs
index 65b19c3f1..27d23c342 100644
--- a/src/Admin/Jobs/AliveJob.cs
+++ b/src/Admin/Jobs/AliveJob.cs
@@ -1,9 +1,6 @@
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Settings;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/DatabaseExpiredGrantsJob.cs b/src/Admin/Jobs/DatabaseExpiredGrantsJob.cs
index 9d425feaf..60ac44828 100644
--- a/src/Admin/Jobs/DatabaseExpiredGrantsJob.cs
+++ b/src/Admin/Jobs/DatabaseExpiredGrantsJob.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs b/src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs
index da682ca82..609351e9f 100644
--- a/src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs
+++ b/src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs b/src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs
index 7267ee3c2..24e05043a 100644
--- a/src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs
+++ b/src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs b/src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs
index 36410c755..4a03d08fd 100644
--- a/src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs
+++ b/src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/DeleteCiphersJob.cs b/src/Admin/Jobs/DeleteCiphersJob.cs
index 62b1f1305..a5a92aa28 100644
--- a/src/Admin/Jobs/DeleteCiphersJob.cs
+++ b/src/Admin/Jobs/DeleteCiphersJob.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Quartz;
 
diff --git a/src/Admin/Jobs/DeleteSendsJob.cs b/src/Admin/Jobs/DeleteSendsJob.cs
index 2aa0b2119..814840fc4 100644
--- a/src/Admin/Jobs/DeleteSendsJob.cs
+++ b/src/Admin/Jobs/DeleteSendsJob.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core;
-using Bit.Core.Context;
+using Bit.Core;
 using Bit.Core.Jobs;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Jobs/JobsHostedService.cs b/src/Admin/Jobs/JobsHostedService.cs
index fec687eea..01ac66a84 100644
--- a/src/Admin/Jobs/JobsHostedService.cs
+++ b/src/Admin/Jobs/JobsHostedService.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using Bit.Core.Jobs;
 using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Admin.Jobs
diff --git a/src/Admin/Models/BillingInformationModel.cs b/src/Admin/Models/BillingInformationModel.cs
index 317a9e8f1..1457a0851 100644
--- a/src/Admin/Models/BillingInformationModel.cs
+++ b/src/Admin/Models/BillingInformationModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Business;
+using Bit.Core.Models.Business;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/ChargeBraintreeModel.cs b/src/Admin/Models/ChargeBraintreeModel.cs
index 5b3a94f16..b7adba8f1 100644
--- a/src/Admin/Models/ChargeBraintreeModel.cs
+++ b/src/Admin/Models/ChargeBraintreeModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/CreateUpdateTransactionModel.cs b/src/Admin/Models/CreateUpdateTransactionModel.cs
index ab0dcb27a..0ab1f0dc8 100644
--- a/src/Admin/Models/CreateUpdateTransactionModel.cs
+++ b/src/Admin/Models/CreateUpdateTransactionModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
diff --git a/src/Admin/Models/CursorPagedModel.cs b/src/Admin/Models/CursorPagedModel.cs
index b9e3fdb38..59d13e268 100644
--- a/src/Admin/Models/CursorPagedModel.cs
+++ b/src/Admin/Models/CursorPagedModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Admin.Models
+namespace Bit.Admin.Models
 {
     public class CursorPagedModel<T>
     {
diff --git a/src/Admin/Models/ErrorViewModel.cs b/src/Admin/Models/ErrorViewModel.cs
index 54717ed20..7a448776d 100644
--- a/src/Admin/Models/ErrorViewModel.cs
+++ b/src/Admin/Models/ErrorViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Admin.Models
+namespace Bit.Admin.Models
 {
     public class ErrorViewModel
     {
diff --git a/src/Admin/Models/HomeModel.cs b/src/Admin/Models/HomeModel.cs
index b5887e402..1bdebbe02 100644
--- a/src/Admin/Models/HomeModel.cs
+++ b/src/Admin/Models/HomeModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/LicenseModel.cs b/src/Admin/Models/LicenseModel.cs
index c8a598449..47d34ad18 100644
--- a/src/Admin/Models/LicenseModel.cs
+++ b/src/Admin/Models/LicenseModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/LogModel.cs b/src/Admin/Models/LogModel.cs
index 16f90b5df..3e0437998 100644
--- a/src/Admin/Models/LogModel.cs
+++ b/src/Admin/Models/LogModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Microsoft.Azure.Documents;
+using Microsoft.Azure.Documents;
 using Newtonsoft.Json.Linq;
 
 namespace Bit.Admin.Models
diff --git a/src/Admin/Models/LogsModel.cs b/src/Admin/Models/LogsModel.cs
index f21874bfa..d274aa9be 100644
--- a/src/Admin/Models/LogsModel.cs
+++ b/src/Admin/Models/LogsModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Serilog.Events;
+using Serilog.Events;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs
index 6d20fe28a..cc7d6b62a 100644
--- a/src/Admin/Models/OrganizationEditModel.cs
+++ b/src/Admin/Models/OrganizationEditModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
diff --git a/src/Admin/Models/OrganizationViewModel.cs b/src/Admin/Models/OrganizationViewModel.cs
index ee38e81f3..c17f273a7 100644
--- a/src/Admin/Models/OrganizationViewModel.cs
+++ b/src/Admin/Models/OrganizationViewModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
diff --git a/src/Admin/Models/PagedModel.cs b/src/Admin/Models/PagedModel.cs
index a4e4087ac..ac4f2e84d 100644
--- a/src/Admin/Models/PagedModel.cs
+++ b/src/Admin/Models/PagedModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Admin.Models
+namespace Bit.Admin.Models
 {
     public abstract class PagedModel<T>
     {
diff --git a/src/Admin/Models/PromoteAdminModel.cs b/src/Admin/Models/PromoteAdminModel.cs
index d7f73839f..0beae6bd8 100644
--- a/src/Admin/Models/PromoteAdminModel.cs
+++ b/src/Admin/Models/PromoteAdminModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Models/ProviderEditModel.cs b/src/Admin/Models/ProviderEditModel.cs
index f272a2ad7..578d0ff22 100644
--- a/src/Admin/Models/ProviderEditModel.cs
+++ b/src/Admin/Models/ProviderEditModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 
diff --git a/src/Admin/Models/ProviderViewModel.cs b/src/Admin/Models/ProviderViewModel.cs
index db963f935..05fae3c9c 100644
--- a/src/Admin/Models/ProviderViewModel.cs
+++ b/src/Admin/Models/ProviderViewModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 
diff --git a/src/Admin/Models/UserEditModel.cs b/src/Admin/Models/UserEditModel.cs
index c6b07e43a..5b789c73d 100644
--- a/src/Admin/Models/UserEditModel.cs
+++ b/src/Admin/Models/UserEditModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;
diff --git a/src/Admin/Models/UserViewModel.cs b/src/Admin/Models/UserViewModel.cs
index d4d900a5d..adc8fb268 100644
--- a/src/Admin/Models/UserViewModel.cs
+++ b/src/Admin/Models/UserViewModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Admin.Models
 {
diff --git a/src/Admin/Program.cs b/src/Admin/Program.cs
index 4885edc1a..d8a55e7b6 100644
--- a/src/Admin/Program.cs
+++ b/src/Admin/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Admin
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index e964814c4..dd1d994f1 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Stripe;
 
 #if !OSS
diff --git a/src/Admin/TagHelpers/ActivePageTagHelper.cs b/src/Admin/TagHelpers/ActivePageTagHelper.cs
index 208c19dff..6e400383d 100644
--- a/src/Admin/TagHelpers/ActivePageTagHelper.cs
+++ b/src/Admin/TagHelpers/ActivePageTagHelper.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Admin/TagHelpers/OptionSelectedTagHelper.cs b/src/Admin/TagHelpers/OptionSelectedTagHelper.cs
index fa696fed4..190d3d1cc 100644
--- a/src/Admin/TagHelpers/OptionSelectedTagHelper.cs
+++ b/src/Admin/TagHelpers/OptionSelectedTagHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Bit.Admin.TagHelpers
diff --git a/src/Api/Controllers/AccountsBillingController.cs b/src/Api/Controllers/AccountsBillingController.cs
index 5581da48c..bc012e7b3 100644
--- a/src/Api/Controllers/AccountsBillingController.cs
+++ b/src/Api/Controllers/AccountsBillingController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Response;
+using Bit.Api.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs
index 80cb145e0..1b74d7a7c 100644
--- a/src/Api/Controllers/AccountsController.cs
+++ b/src/Api/Controllers/AccountsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs
index 685473ff3..e84731a9a 100644
--- a/src/Api/Controllers/CiphersController.cs
+++ b/src/Api/Controllers/CiphersController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Messaging.EventGrid;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
@@ -21,7 +17,6 @@ using Bit.Core.Utilities;
 using Core.Models.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Api.Controllers
 {
diff --git a/src/Api/Controllers/CollectionsController.cs b/src/Api/Controllers/CollectionsController.cs
index b1116b137..886a796cc 100644
--- a/src/Api/Controllers/CollectionsController.cs
+++ b/src/Api/Controllers/CollectionsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Context;
 using Bit.Core.Entities;
diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs
index 58777e90e..8bfa5d7b0 100644
--- a/src/Api/Controllers/DevicesController.cs
+++ b/src/Api/Controllers/DevicesController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
diff --git a/src/Api/Controllers/EmergencyAccessController.cs b/src/Api/Controllers/EmergencyAccessController.cs
index 9c04c9dc4..4e8ac834d 100644
--- a/src/Api/Controllers/EmergencyAccessController.cs
+++ b/src/Api/Controllers/EmergencyAccessController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Core.Entities;
diff --git a/src/Api/Controllers/EventsController.cs b/src/Api/Controllers/EventsController.cs
index b1bc93a0a..ad657692e 100644
--- a/src/Api/Controllers/EventsController.cs
+++ b/src/Api/Controllers/EventsController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Response;
+using Bit.Api.Models.Response;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Controllers/FoldersController.cs b/src/Api/Controllers/FoldersController.cs
index ddd401ec9..752856302 100644
--- a/src/Api/Controllers/FoldersController.cs
+++ b/src/Api/Controllers/FoldersController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
diff --git a/src/Api/Controllers/GroupsController.cs b/src/Api/Controllers/GroupsController.cs
index 9febe3300..fc226c4d1 100644
--- a/src/Api/Controllers/GroupsController.cs
+++ b/src/Api/Controllers/GroupsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
diff --git a/src/Api/Controllers/HibpController.cs b/src/Api/Controllers/HibpController.cs
index a11d92d8c..3b94901b0 100644
--- a/src/Api/Controllers/HibpController.cs
+++ b/src/Api/Controllers/HibpController.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
+using System.Net;
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
diff --git a/src/Api/Controllers/InfoController.cs b/src/Api/Controllers/InfoController.cs
index 82aa7b938..206ba6810 100644
--- a/src/Api/Controllers/InfoController.cs
+++ b/src/Api/Controllers/InfoController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
diff --git a/src/Api/Controllers/InstallationsController.cs b/src/Api/Controllers/InstallationsController.cs
index 3e28f325f..c75468b47 100644
--- a/src/Api/Controllers/InstallationsController.cs
+++ b/src/Api/Controllers/InstallationsController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
diff --git a/src/Api/Controllers/LicensesController.cs b/src/Api/Controllers/LicensesController.cs
index dc4baa140..4de079885 100644
--- a/src/Api/Controllers/LicensesController.cs
+++ b/src/Api/Controllers/LicensesController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Repositories;
diff --git a/src/Api/Controllers/MiscController.cs b/src/Api/Controllers/MiscController.cs
index 1cc760b95..edd4dfde4 100644
--- a/src/Api/Controllers/MiscController.cs
+++ b/src/Api/Controllers/MiscController.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/Controllers/OrganizationConnectionsController.cs b/src/Api/Controllers/OrganizationConnectionsController.cs
index c88a58913..2302116aa 100644
--- a/src/Api/Controllers/OrganizationConnectionsController.cs
+++ b/src/Api/Controllers/OrganizationConnectionsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response.Organizations;
 using Bit.Core.Context;
 using Bit.Core.Entities;
diff --git a/src/Api/Controllers/OrganizationSponsorshipsController.cs b/src/Api/Controllers/OrganizationSponsorshipsController.cs
index 190ebcba8..ae7be386c 100644
--- a/src/Api/Controllers/OrganizationSponsorshipsController.cs
+++ b/src/Api/Controllers/OrganizationSponsorshipsController.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response.Organizations;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Request.OrganizationSponsorships;
-using Bit.Core.Models.Api.Request.OrganizationSponsorships;
-using Bit.Core.Models.Api.Response.OrganizationSponsorships;
 using Bit.Core.Models.Api.Response.OrganizationSponsorships;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Api/Controllers/OrganizationUsersController.cs b/src/Api/Controllers/OrganizationUsersController.cs
index 17d73ff67..3ed84311e 100644
--- a/src/Api/Controllers/OrganizationUsersController.cs
+++ b/src/Api/Controllers/OrganizationUsersController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Organizations;
 using Bit.Core.Context;
diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index 18d341db3..da73ab9e6 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
diff --git a/src/Api/Controllers/PlansController.cs b/src/Api/Controllers/PlansController.cs
index b19eadc0c..ba609511f 100644
--- a/src/Api/Controllers/PlansController.cs
+++ b/src/Api/Controllers/PlansController.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Response;
+using Bit.Api.Models.Response;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/Controllers/PoliciesController.cs b/src/Api/Controllers/PoliciesController.cs
index 91291a769..756b8a9d3 100644
--- a/src/Api/Controllers/PoliciesController.cs
+++ b/src/Api/Controllers/PoliciesController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Context;
 using Bit.Core.Enums;
diff --git a/src/Api/Controllers/ProviderOrganizationsController.cs b/src/Api/Controllers/ProviderOrganizationsController.cs
index ae5182651..f4772fbe2 100644
--- a/src/Api/Controllers/ProviderOrganizationsController.cs
+++ b/src/Api/Controllers/ProviderOrganizationsController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Request.Providers;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Providers;
 using Bit.Core.Context;
diff --git a/src/Api/Controllers/ProviderUsersController.cs b/src/Api/Controllers/ProviderUsersController.cs
index f5752151a..ad9dec639 100644
--- a/src/Api/Controllers/ProviderUsersController.cs
+++ b/src/Api/Controllers/ProviderUsersController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Request.Providers;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Providers;
 using Bit.Core.Context;
diff --git a/src/Api/Controllers/ProvidersController.cs b/src/Api/Controllers/ProvidersController.cs
index 1b586a1c3..5969c0c6f 100644
--- a/src/Api/Controllers/ProvidersController.cs
+++ b/src/Api/Controllers/ProvidersController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Request.Providers;
 using Bit.Api.Models.Response.Providers;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
diff --git a/src/Api/Controllers/PushController.cs b/src/Api/Controllers/PushController.cs
index ba85e54db..afeaf92f7 100644
--- a/src/Api/Controllers/PushController.cs
+++ b/src/Api/Controllers/PushController.cs
@@ -1,15 +1,11 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
 
 namespace Bit.Api.Controllers
 {
diff --git a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
index e29afc436..b74192983 100644
--- a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
+++ b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Request.Organizations;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
diff --git a/src/Api/Controllers/SendsController.cs b/src/Api/Controllers/SendsController.cs
index f21885b1c..405f5c659 100644
--- a/src/Api/Controllers/SendsController.cs
+++ b/src/Api/Controllers/SendsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Messaging.EventGrid;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
@@ -19,7 +15,6 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Api.Controllers
 {
diff --git a/src/Api/Controllers/SettingsController.cs b/src/Api/Controllers/SettingsController.cs
index 05d8757fe..2db70b017 100644
--- a/src/Api/Controllers/SettingsController.cs
+++ b/src/Api/Controllers/SettingsController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/Controllers/SyncController.cs b/src/Api/Controllers/SyncController.cs
index d42b67d2d..c85554386 100644
--- a/src/Api/Controllers/SyncController.cs
+++ b/src/Api/Controllers/SyncController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Response;
+using Bit.Api.Models.Response;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
diff --git a/src/Api/Controllers/TwoFactorController.cs b/src/Api/Controllers/TwoFactorController.cs
index 9238e53f0..ab2e19eed 100644
--- a/src/Api/Controllers/TwoFactorController.cs
+++ b/src/Api/Controllers/TwoFactorController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.TwoFactor;
diff --git a/src/Api/Controllers/UsersController.cs b/src/Api/Controllers/UsersController.cs
index 259ff19f6..eeb50301e 100644
--- a/src/Api/Controllers/UsersController.cs
+++ b/src/Api/Controllers/UsersController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Models.Response;
+using Bit.Api.Models.Response;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/Jobs/AliveJob.cs b/src/Api/Jobs/AliveJob.cs
index f9e2811a9..354b8206e 100644
--- a/src/Api/Jobs/AliveJob.cs
+++ b/src/Api/Jobs/AliveJob.cs
@@ -1,7 +1,5 @@
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/EmergencyAccessNotificationJob.cs b/src/Api/Jobs/EmergencyAccessNotificationJob.cs
index 16a4d1198..4851ef38c 100644
--- a/src/Api/Jobs/EmergencyAccessNotificationJob.cs
+++ b/src/Api/Jobs/EmergencyAccessNotificationJob.cs
@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/EmergencyAccessTimeoutJob.cs b/src/Api/Jobs/EmergencyAccessTimeoutJob.cs
index 7cad6a7fe..7e7e85c6d 100644
--- a/src/Api/Jobs/EmergencyAccessTimeoutJob.cs
+++ b/src/Api/Jobs/EmergencyAccessTimeoutJob.cs
@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/JobsHostedService.cs b/src/Api/Jobs/JobsHostedService.cs
index eabe02427..99adbb0e2 100644
--- a/src/Api/Jobs/JobsHostedService.cs
+++ b/src/Api/Jobs/JobsHostedService.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs b/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
index 975d68fdb..7ffb32d3b 100644
--- a/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
+++ b/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Jobs;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/ValidateOrganizationsJob.cs b/src/Api/Jobs/ValidateOrganizationsJob.cs
index 9db0e18f5..d3ec2dad5 100644
--- a/src/Api/Jobs/ValidateOrganizationsJob.cs
+++ b/src/Api/Jobs/ValidateOrganizationsJob.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Services;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Jobs/ValidateUsersJob.cs b/src/Api/Jobs/ValidateUsersJob.cs
index c1f5c699b..126162427 100644
--- a/src/Api/Jobs/ValidateUsersJob.cs
+++ b/src/Api/Jobs/ValidateUsersJob.cs
@@ -1,7 +1,5 @@
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Services;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Api.Jobs
diff --git a/src/Api/Models/CipherLoginModel.cs b/src/Api/Models/CipherLoginModel.cs
index 0b5f9b64e..156da6ba7 100644
--- a/src/Api/Models/CipherLoginModel.cs
+++ b/src/Api/Models/CipherLoginModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/Models/CipherPasswordHistoryModel.cs b/src/Api/Models/CipherPasswordHistoryModel.cs
index 53831842a..bd9eb296f 100644
--- a/src/Api/Models/CipherPasswordHistoryModel.cs
+++ b/src/Api/Models/CipherPasswordHistoryModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/Models/Public/AssociationWithPermissionsBaseModel.cs b/src/Api/Models/Public/AssociationWithPermissionsBaseModel.cs
index b25212937..54a0a204f 100644
--- a/src/Api/Models/Public/AssociationWithPermissionsBaseModel.cs
+++ b/src/Api/Models/Public/AssociationWithPermissionsBaseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Public
 {
diff --git a/src/Api/Models/Public/MemberBaseModel.cs b/src/Api/Models/Public/MemberBaseModel.cs
index e3c233bf2..47621cf18 100644
--- a/src/Api/Models/Public/MemberBaseModel.cs
+++ b/src/Api/Models/Public/MemberBaseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Api/Models/Public/PolicyBaseModel.cs b/src/Api/Models/Public/PolicyBaseModel.cs
index 70f81b5b5..1814c9f4a 100644
--- a/src/Api/Models/Public/PolicyBaseModel.cs
+++ b/src/Api/Models/Public/PolicyBaseModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Public
 {
diff --git a/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs b/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs
index 68dcfe6e4..36b77137d 100644
--- a/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs
+++ b/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request
 {
diff --git a/src/Api/Models/Public/Request/EventFilterRequestModel.cs b/src/Api/Models/Public/Request/EventFilterRequestModel.cs
index 40109de63..74a1700a7 100644
--- a/src/Api/Models/Public/Request/EventFilterRequestModel.cs
+++ b/src/Api/Models/Public/Request/EventFilterRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Exceptions;
+using Bit.Core.Exceptions;
 
 namespace Bit.Api.Models.Public.Request
 {
diff --git a/src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs b/src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs
index d3e6947d5..12e7d4489 100644
--- a/src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs
+++ b/src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request
 {
diff --git a/src/Api/Models/Public/Request/MemberCreateRequestModel.cs b/src/Api/Models/Public/Request/MemberCreateRequestModel.cs
index fac89b377..1845fee22 100644
--- a/src/Api/Models/Public/Request/MemberCreateRequestModel.cs
+++ b/src/Api/Models/Public/Request/MemberCreateRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/Models/Public/Request/MemberUpdateRequestModel.cs b/src/Api/Models/Public/Request/MemberUpdateRequestModel.cs
index e842c4752..44a07f526 100644
--- a/src/Api/Models/Public/Request/MemberUpdateRequestModel.cs
+++ b/src/Api/Models/Public/Request/MemberUpdateRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request
 {
diff --git a/src/Api/Models/Public/Request/OrganizationImportRequestModel.cs b/src/Api/Models/Public/Request/OrganizationImportRequestModel.cs
index ffdb3ebc2..2b2177b48 100644
--- a/src/Api/Models/Public/Request/OrganizationImportRequestModel.cs
+++ b/src/Api/Models/Public/Request/OrganizationImportRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
diff --git a/src/Api/Models/Public/Request/PolicyUpdateRequestModel.cs b/src/Api/Models/Public/Request/PolicyUpdateRequestModel.cs
index faede3da0..c563ca9d6 100644
--- a/src/Api/Models/Public/Request/PolicyUpdateRequestModel.cs
+++ b/src/Api/Models/Public/Request/PolicyUpdateRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request
diff --git a/src/Api/Models/Public/Request/UpdateGroupIdsRequestModel.cs b/src/Api/Models/Public/Request/UpdateGroupIdsRequestModel.cs
index f5d2049ba..a691777aa 100644
--- a/src/Api/Models/Public/Request/UpdateGroupIdsRequestModel.cs
+++ b/src/Api/Models/Public/Request/UpdateGroupIdsRequestModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Bit.Api.Models.Public.Request
+namespace Bit.Api.Models.Public.Request
 {
     public class UpdateGroupIdsRequestModel
     {
diff --git a/src/Api/Models/Public/Request/UpdateMemberIdsRequestModel.cs b/src/Api/Models/Public/Request/UpdateMemberIdsRequestModel.cs
index aecea9fc3..03ea89eac 100644
--- a/src/Api/Models/Public/Request/UpdateMemberIdsRequestModel.cs
+++ b/src/Api/Models/Public/Request/UpdateMemberIdsRequestModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Bit.Api.Models.Public.Request
+namespace Bit.Api.Models.Public.Request
 {
     public class UpdateMemberIdsRequestModel
     {
diff --git a/src/Api/Models/Public/Response/AssociationWithPermissionsResponseModel.cs b/src/Api/Models/Public/Response/AssociationWithPermissionsResponseModel.cs
index 18529a103..823b35904 100644
--- a/src/Api/Models/Public/Response/AssociationWithPermissionsResponseModel.cs
+++ b/src/Api/Models/Public/Response/AssociationWithPermissionsResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Api.Models.Public.Response
 {
diff --git a/src/Api/Models/Public/Response/CollectionResponseModel.cs b/src/Api/Models/Public/Response/CollectionResponseModel.cs
index 263b35d92..8e318e585 100644
--- a/src/Api/Models/Public/Response/CollectionResponseModel.cs
+++ b/src/Api/Models/Public/Response/CollectionResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Public/Response/ErrorResponseModel.cs b/src/Api/Models/Public/Response/ErrorResponseModel.cs
index c0e64f825..dd2f2ba0e 100644
--- a/src/Api/Models/Public/Response/ErrorResponseModel.cs
+++ b/src/Api/Models/Public/Response/ErrorResponseModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Bit.Api.Models.Public.Response
diff --git a/src/Api/Models/Public/Response/EventResponseModel.cs b/src/Api/Models/Public/Response/EventResponseModel.cs
index 54d87fcbd..4a5f9f652 100644
--- a/src/Api/Models/Public/Response/EventResponseModel.cs
+++ b/src/Api/Models/Public/Response/EventResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Public/Response/GroupResponseModel.cs b/src/Api/Models/Public/Response/GroupResponseModel.cs
index 7629280ce..4c6a76c8f 100644
--- a/src/Api/Models/Public/Response/GroupResponseModel.cs
+++ b/src/Api/Models/Public/Response/GroupResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Public/Response/ListResponseModel.cs b/src/Api/Models/Public/Response/ListResponseModel.cs
index 287e25140..78328c3e1 100644
--- a/src/Api/Models/Public/Response/ListResponseModel.cs
+++ b/src/Api/Models/Public/Response/ListResponseModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Public.Response
 {
diff --git a/src/Api/Models/Public/Response/MemberResponseModel.cs b/src/Api/Models/Public/Response/MemberResponseModel.cs
index 850aaa7ce..ceac9fca2 100644
--- a/src/Api/Models/Public/Response/MemberResponseModel.cs
+++ b/src/Api/Models/Public/Response/MemberResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Public/Response/PolicyResponseModel.cs b/src/Api/Models/Public/Response/PolicyResponseModel.cs
index fbbcf6a0e..9806c96d0 100644
--- a/src/Api/Models/Public/Response/PolicyResponseModel.cs
+++ b/src/Api/Models/Public/Response/PolicyResponseModel.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Public.Response
 {
diff --git a/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs b/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs
index 869a0f6c4..321fef658 100644
--- a/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Api.Models.Request.Accounts
+namespace Bit.Api.Models.Request.Accounts
 {
     public class ImportCiphersRequestModel
     {
diff --git a/src/Api/Models/Request/Accounts/KdfRequestModel.cs b/src/Api/Models/Request/Accounts/KdfRequestModel.cs
index b08cbb7c2..eea6ad201 100644
--- a/src/Api/Models/Request/Accounts/KdfRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/KdfRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
 namespace Bit.Api.Models.Request.Accounts
diff --git a/src/Api/Models/Request/Accounts/PremiumRequestModel.cs b/src/Api/Models/Request/Accounts/PremiumRequestModel.cs
index 35aae4a69..3fd95b1ce 100644
--- a/src/Api/Models/Request/Accounts/PremiumRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/PremiumRequestModel.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Settings;
-using Microsoft.AspNetCore.Http;
 using Enums = Bit.Core.Enums;
 
 namespace Bit.Api.Models.Request.Accounts
diff --git a/src/Api/Models/Request/Accounts/SecretVerificationRequestModel.cs b/src/Api/Models/Request/Accounts/SecretVerificationRequestModel.cs
index 602e762c6..e1042d5a3 100644
--- a/src/Api/Models/Request/Accounts/SecretVerificationRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/SecretVerificationRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Accounts
 {
diff --git a/src/Api/Models/Request/Accounts/StorageRequestModel.cs b/src/Api/Models/Request/Accounts/StorageRequestModel.cs
index 9a5373db1..beb7c189b 100644
--- a/src/Api/Models/Request/Accounts/StorageRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/StorageRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Accounts
 {
diff --git a/src/Api/Models/Request/Accounts/TaxInfoUpdateRequestModel.cs b/src/Api/Models/Request/Accounts/TaxInfoUpdateRequestModel.cs
index a769ed30f..205356e68 100644
--- a/src/Api/Models/Request/Accounts/TaxInfoUpdateRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/TaxInfoUpdateRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Accounts
 {
diff --git a/src/Api/Models/Request/Accounts/UpdateKeyRequestModel.cs b/src/Api/Models/Request/Accounts/UpdateKeyRequestModel.cs
index 3ce12ff0b..31ac2d830 100644
--- a/src/Api/Models/Request/Accounts/UpdateKeyRequestModel.cs
+++ b/src/Api/Models/Request/Accounts/UpdateKeyRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Accounts
 {
diff --git a/src/Api/Models/Request/BitPayInvoiceRequestModel.cs b/src/Api/Models/Request/BitPayInvoiceRequestModel.cs
index ba8bfc889..9e87cca00 100644
--- a/src/Api/Models/Request/BitPayInvoiceRequestModel.cs
+++ b/src/Api/Models/Request/BitPayInvoiceRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Settings;
 
 namespace Bit.Api.Models.Request
diff --git a/src/Api/Models/Request/CipherRequestModel.cs b/src/Api/Models/Request/CipherRequestModel.cs
index 417fb4497..90435132a 100644
--- a/src/Api/Models/Request/CipherRequestModel.cs
+++ b/src/Api/Models/Request/CipherRequestModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Api/Models/Request/CollectionRequestModel.cs b/src/Api/Models/Request/CollectionRequestModel.cs
index 65b2887a2..e09510347 100644
--- a/src/Api/Models/Request/CollectionRequestModel.cs
+++ b/src/Api/Models/Request/CollectionRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/Models/Request/DeviceRequestModels.cs b/src/Api/Models/Request/DeviceRequestModels.cs
index 371f159eb..b47693e3b 100644
--- a/src/Api/Models/Request/DeviceRequestModels.cs
+++ b/src/Api/Models/Request/DeviceRequestModels.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
diff --git a/src/Api/Models/Request/DeviceVerificationRequestModel.cs b/src/Api/Models/Request/DeviceVerificationRequestModel.cs
index acc7aead8..e8c22d9fe 100644
--- a/src/Api/Models/Request/DeviceVerificationRequestModel.cs
+++ b/src/Api/Models/Request/DeviceVerificationRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Request
diff --git a/src/Api/Models/Request/FolderRequestModel.cs b/src/Api/Models/Request/FolderRequestModel.cs
index e3060bdcc..52b0fcdb3 100644
--- a/src/Api/Models/Request/FolderRequestModel.cs
+++ b/src/Api/Models/Request/FolderRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/Models/Request/GroupRequestModel.cs b/src/Api/Models/Request/GroupRequestModel.cs
index 2c6eb5c80..23b817624 100644
--- a/src/Api/Models/Request/GroupRequestModel.cs
+++ b/src/Api/Models/Request/GroupRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Request
diff --git a/src/Api/Models/Request/IapCheckRequestModel.cs b/src/Api/Models/Request/IapCheckRequestModel.cs
index 649fffcab..d7ca6ba3b 100644
--- a/src/Api/Models/Request/IapCheckRequestModel.cs
+++ b/src/Api/Models/Request/IapCheckRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Enums = Bit.Core.Enums;
 
 namespace Bit.Api.Models.Request
diff --git a/src/Api/Models/Request/LicenseRequestModel.cs b/src/Api/Models/Request/LicenseRequestModel.cs
index 795a0a7bb..382f68615 100644
--- a/src/Api/Models/Request/LicenseRequestModel.cs
+++ b/src/Api/Models/Request/LicenseRequestModel.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Http;
 
 namespace Bit.Api.Models.Request
 {
diff --git a/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs b/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
index 090b1a905..b70f39587 100644
--- a/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Api.Models.Request.Organizations
+namespace Bit.Api.Models.Request.Organizations
 {
     public class ImportOrganizationCiphersRequestModel
     {
diff --git a/src/Api/Models/Request/Organizations/ImportOrganizationUsersRequestModel.cs b/src/Api/Models/Request/Organizations/ImportOrganizationUsersRequestModel.cs
index 73fd884dc..d35e051e9 100644
--- a/src/Api/Models/Request/Organizations/ImportOrganizationUsersRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/ImportOrganizationUsersRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Business;
 
 namespace Bit.Api.Models.Request.Organizations
diff --git a/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs
index f26ba9428..91132ec5e 100644
--- a/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
diff --git a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs
index 8cd0c2514..4f84ea5c6 100644
--- a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
diff --git a/src/Api/Models/Request/Organizations/OrganizationSeatRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationSeatRequestModel.cs
index cee71526b..068d09624 100644
--- a/src/Api/Models/Request/Organizations/OrganizationSeatRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationSeatRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Organizations
 {
diff --git a/src/Api/Models/Request/Organizations/OrganizationSponsorshipRedeemRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationSponsorshipRedeemRequestModel.cs
index dc857e8e6..4a4cc2602 100644
--- a/src/Api/Models/Request/Organizations/OrganizationSponsorshipRedeemRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationSponsorshipRedeemRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
 namespace Bit.Api.Models.Request.Organizations
diff --git a/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs
index 6444118bd..5291ce175 100644
--- a/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
diff --git a/src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs b/src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs
index ef0b87a68..09cb7efb1 100644
--- a/src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs
+++ b/src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Core.Entities;
diff --git a/src/Api/Models/Request/PolicyRequestModel.cs b/src/Api/Models/Request/PolicyRequestModel.cs
index fe3a084bb..927b7fcc3 100644
--- a/src/Api/Models/Request/PolicyRequestModel.cs
+++ b/src/Api/Models/Request/PolicyRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Api/Models/Request/Providers/ProviderOrganizationAddRequestModel.cs b/src/Api/Models/Request/Providers/ProviderOrganizationAddRequestModel.cs
index a4043b7c6..d3d203f4d 100644
--- a/src/Api/Models/Request/Providers/ProviderOrganizationAddRequestModel.cs
+++ b/src/Api/Models/Request/Providers/ProviderOrganizationAddRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Providers
 {
diff --git a/src/Api/Models/Request/Providers/ProviderUserRequestModels.cs b/src/Api/Models/Request/Providers/ProviderUserRequestModels.cs
index 923b0680e..cbce7bc90 100644
--- a/src/Api/Models/Request/Providers/ProviderUserRequestModels.cs
+++ b/src/Api/Models/Request/Providers/ProviderUserRequestModels.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
diff --git a/src/Api/Models/Request/SelectionReadOnlyRequestModel.cs b/src/Api/Models/Request/SelectionReadOnlyRequestModel.cs
index 1b2c71d8f..f5d2043d5 100644
--- a/src/Api/Models/Request/SelectionReadOnlyRequestModel.cs
+++ b/src/Api/Models/Request/SelectionReadOnlyRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Data;
 
 namespace Bit.Api.Models.Request
diff --git a/src/Api/Models/Request/SendRequestModel.cs b/src/Api/Models/Request/SendRequestModel.cs
index b6a802adf..1e3182359 100644
--- a/src/Api/Models/Request/SendRequestModel.cs
+++ b/src/Api/Models/Request/SendRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Api/Models/Request/TwoFactorRequestModels.cs b/src/Api/Models/Request/TwoFactorRequestModels.cs
index 0642d62ea..4ccc209a6 100644
--- a/src/Api/Models/Request/TwoFactorRequestModels.cs
+++ b/src/Api/Models/Request/TwoFactorRequestModels.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Api/Models/Request/UpdateDomainsRequestModel.cs b/src/Api/Models/Request/UpdateDomainsRequestModel.cs
index 385a3f6a5..0bc3f0385 100644
--- a/src/Api/Models/Request/UpdateDomainsRequestModel.cs
+++ b/src/Api/Models/Request/UpdateDomainsRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
diff --git a/src/Api/Models/Response/ApiKeyResponseModel.cs b/src/Api/Models/Response/ApiKeyResponseModel.cs
index 84a2b8b2a..3987e22d5 100644
--- a/src/Api/Models/Response/ApiKeyResponseModel.cs
+++ b/src/Api/Models/Response/ApiKeyResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
diff --git a/src/Api/Models/Response/AttachmentResponseModel.cs b/src/Api/Models/Response/AttachmentResponseModel.cs
index 5e8c88574..5659cb535 100644
--- a/src/Api/Models/Response/AttachmentResponseModel.cs
+++ b/src/Api/Models/Response/AttachmentResponseModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Response/BillingHistoryResponseModel.cs b/src/Api/Models/Response/BillingHistoryResponseModel.cs
index 91ca99d18..892a6530d 100644
--- a/src/Api/Models/Response/BillingHistoryResponseModel.cs
+++ b/src/Api/Models/Response/BillingHistoryResponseModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 
 namespace Bit.Api.Models.Response
diff --git a/src/Api/Models/Response/BillingResponseModel.cs b/src/Api/Models/Response/BillingResponseModel.cs
index cba610c49..6e2930e1b 100644
--- a/src/Api/Models/Response/BillingResponseModel.cs
+++ b/src/Api/Models/Response/BillingResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 
diff --git a/src/Api/Models/Response/CipherResponseModel.cs b/src/Api/Models/Response/CipherResponseModel.cs
index 98e53abef..5edc27145 100644
--- a/src/Api/Models/Response/CipherResponseModel.cs
+++ b/src/Api/Models/Response/CipherResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/CollectionResponseModel.cs b/src/Api/Models/Response/CollectionResponseModel.cs
index c3809cb1d..5ac923a9d 100644
--- a/src/Api/Models/Response/CollectionResponseModel.cs
+++ b/src/Api/Models/Response/CollectionResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Response/DeviceResponseModel.cs b/src/Api/Models/Response/DeviceResponseModel.cs
index acf4b846f..e25562cbb 100644
--- a/src/Api/Models/Response/DeviceResponseModel.cs
+++ b/src/Api/Models/Response/DeviceResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
diff --git a/src/Api/Models/Response/DeviceVerificationResponseModel.cs b/src/Api/Models/Response/DeviceVerificationResponseModel.cs
index 14711a789..1f4754761 100644
--- a/src/Api/Models/Response/DeviceVerificationResponseModel.cs
+++ b/src/Api/Models/Response/DeviceVerificationResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
 {
diff --git a/src/Api/Models/Response/DomainsResponseModel.cs b/src/Api/Models/Response/DomainsResponseModel.cs
index 4c7126100..fd6ea46b6 100644
--- a/src/Api/Models/Response/DomainsResponseModel.cs
+++ b/src/Api/Models/Response/DomainsResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/EmergencyAccessResponseModel.cs b/src/Api/Models/Response/EmergencyAccessResponseModel.cs
index 61a7260ad..16d255e92 100644
--- a/src/Api/Models/Response/EmergencyAccessResponseModel.cs
+++ b/src/Api/Models/Response/EmergencyAccessResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Response/EventResponseModel.cs b/src/Api/Models/Response/EventResponseModel.cs
index 627584913..40ccbb7e1 100644
--- a/src/Api/Models/Response/EventResponseModel.cs
+++ b/src/Api/Models/Response/EventResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Response/FolderResponseModel.cs b/src/Api/Models/Response/FolderResponseModel.cs
index 2f780ec1d..0396471e1 100644
--- a/src/Api/Models/Response/FolderResponseModel.cs
+++ b/src/Api/Models/Response/FolderResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
diff --git a/src/Api/Models/Response/GroupResponseModel.cs b/src/Api/Models/Response/GroupResponseModel.cs
index 9bede72e4..c75ff31e2 100644
--- a/src/Api/Models/Response/GroupResponseModel.cs
+++ b/src/Api/Models/Response/GroupResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Response/KeysResponseModel.cs b/src/Api/Models/Response/KeysResponseModel.cs
index 32c2e2353..1ca1ae052 100644
--- a/src/Api/Models/Response/KeysResponseModel.cs
+++ b/src/Api/Models/Response/KeysResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
diff --git a/src/Api/Models/Response/ListResponseModel.cs b/src/Api/Models/Response/ListResponseModel.cs
index 06762bf49..c16a3461c 100644
--- a/src/Api/Models/Response/ListResponseModel.cs
+++ b/src/Api/Models/Response/ListResponseModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
 {
diff --git a/src/Api/Models/Response/Organizations/OrganizationApiKeyInformationResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationApiKeyInformationResponseModel.cs
index 516b73944..05adb502a 100644
--- a/src/Api/Models/Response/Organizations/OrganizationApiKeyInformationResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationApiKeyInformationResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
diff --git a/src/Api/Models/Response/Organizations/OrganizationAutoEnrollStatusResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationAutoEnrollStatusResponseModel.cs
index 7f0168488..529168c6a 100644
--- a/src/Api/Models/Response/Organizations/OrganizationAutoEnrollStatusResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationAutoEnrollStatusResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response.Organizations
 {
diff --git a/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs
index 1d3063965..86fb9b4db 100644
--- a/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
diff --git a/src/Api/Models/Response/Organizations/OrganizationKeysResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationKeysResponseModel.cs
index 622af5824..06430bef2 100644
--- a/src/Api/Models/Response/Organizations/OrganizationKeysResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationKeysResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response.Organizations
diff --git a/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
index 32e005215..81b9c3d9a 100644
--- a/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
diff --git a/src/Api/Models/Response/Organizations/OrganizationSponsorshipSyncStatusResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationSponsorshipSyncStatusResponseModel.cs
index 897558f95..33e349bbf 100644
--- a/src/Api/Models/Response/Organizations/OrganizationSponsorshipSyncStatusResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationSponsorshipSyncStatusResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response.Organizations
 {
diff --git a/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
index ac2c7593b..7be68c41a 100644
--- a/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Response/PlanResponseModel.cs b/src/Api/Models/Response/PlanResponseModel.cs
index 539b6adab..5974772a8 100644
--- a/src/Api/Models/Response/PlanResponseModel.cs
+++ b/src/Api/Models/Response/PlanResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.StaticStore;
 
diff --git a/src/Api/Models/Response/PolicyResponseModel.cs b/src/Api/Models/Response/PolicyResponseModel.cs
index b7d97af92..7f725ba31 100644
--- a/src/Api/Models/Response/PolicyResponseModel.cs
+++ b/src/Api/Models/Response/PolicyResponseModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
index b75ad422a..cb41f8b35 100644
--- a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
+++ b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Api/Models/Response/ProfileResponseModel.cs
index 0f13173dc..0cb066f56 100644
--- a/src/Api/Models/Response/ProfileResponseModel.cs
+++ b/src/Api/Models/Response/ProfileResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Api.Models.Response.Providers;
+using Bit.Api.Models.Response.Providers;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Response/Providers/ProviderOrganizationResponseModel.cs b/src/Api/Models/Response/Providers/ProviderOrganizationResponseModel.cs
index 29412186c..fa03562a7 100644
--- a/src/Api/Models/Response/Providers/ProviderOrganizationResponseModel.cs
+++ b/src/Api/Models/Response/Providers/ProviderOrganizationResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/Models/Response/Providers/ProviderResponseModel.cs b/src/Api/Models/Response/Providers/ProviderResponseModel.cs
index f4fabd214..02cea09d1 100644
--- a/src/Api/Models/Response/Providers/ProviderResponseModel.cs
+++ b/src/Api/Models/Response/Providers/ProviderResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response.Providers
diff --git a/src/Api/Models/Response/Providers/ProviderUserResponseModel.cs b/src/Api/Models/Response/Providers/ProviderUserResponseModel.cs
index b50196678..44122b2b0 100644
--- a/src/Api/Models/Response/Providers/ProviderUserResponseModel.cs
+++ b/src/Api/Models/Response/Providers/ProviderUserResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
diff --git a/src/Api/Models/Response/SelectionReadOnlyResponseModel.cs b/src/Api/Models/Response/SelectionReadOnlyResponseModel.cs
index cec8bbe08..a3ff0ddf6 100644
--- a/src/Api/Models/Response/SelectionReadOnlyResponseModel.cs
+++ b/src/Api/Models/Response/SelectionReadOnlyResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Api.Models.Response
 {
diff --git a/src/Api/Models/Response/SendAccessResponseModel.cs b/src/Api/Models/Response/SendAccessResponseModel.cs
index 2a32b86c9..7e2adc04f 100644
--- a/src/Api/Models/Response/SendAccessResponseModel.cs
+++ b/src/Api/Models/Response/SendAccessResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/SendResponseModel.cs b/src/Api/Models/Response/SendResponseModel.cs
index 3dde73b65..c4f88157d 100644
--- a/src/Api/Models/Response/SendResponseModel.cs
+++ b/src/Api/Models/Response/SendResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/SubscriptionResponseModel.cs b/src/Api/Models/Response/SubscriptionResponseModel.cs
index c1e8810d7..e8b9dbbcb 100644
--- a/src/Api/Models/Response/SubscriptionResponseModel.cs
+++ b/src/Api/Models/Response/SubscriptionResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
diff --git a/src/Api/Models/Response/SyncResponseModel.cs b/src/Api/Models/Response/SyncResponseModel.cs
index 8f09bfba6..8c9f12686 100644
--- a/src/Api/Models/Response/SyncResponseModel.cs
+++ b/src/Api/Models/Response/SyncResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Api/Models/Response/TaxRateResponseModel.cs b/src/Api/Models/Response/TaxRateResponseModel.cs
index 5d4dfdb16..ec08cb7f7 100644
--- a/src/Api/Models/Response/TaxRateResponseModel.cs
+++ b/src/Api/Models/Response/TaxRateResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs
index 13006c432..3747a411a 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using OtpNet;
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs
index 98c366a71..c2461abdb 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs
index 93bbe9e62..9f8fecc4f 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs
index 4213fb9b2..c742d8b2f 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs
index 6bff37b12..5d87a0e94 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response.TwoFactor
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs
index f214955d3..05c3b2f44 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
diff --git a/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs b/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
index 25b5d55c7..9654bd1e6 100644
--- a/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
+++ b/src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
diff --git a/src/Api/Models/Response/UserKeyResponseModel.cs b/src/Api/Models/Response/UserKeyResponseModel.cs
index 55b3e4dd6..b31f1e95a 100644
--- a/src/Api/Models/Response/UserKeyResponseModel.cs
+++ b/src/Api/Models/Response/UserKeyResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
 {
diff --git a/src/Api/Program.cs b/src/Api/Program.cs
index 134b476a4..bcd6284af 100644
--- a/src/Api/Program.cs
+++ b/src/Api/Program.cs
@@ -1,7 +1,5 @@
 using AspNetCoreRateLimit;
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
 using Serilog.Events;
 
diff --git a/src/Api/Public/Controllers/CollectionsController.cs b/src/Api/Public/Controllers/CollectionsController.cs
index 350936349..677d53861 100644
--- a/src/Api/Public/Controllers/CollectionsController.cs
+++ b/src/Api/Public/Controllers/CollectionsController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Public/Controllers/EventsController.cs b/src/Api/Public/Controllers/EventsController.cs
index 724799365..5fe5bdb7b 100644
--- a/src/Api/Public/Controllers/EventsController.cs
+++ b/src/Api/Public/Controllers/EventsController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Public/Controllers/GroupsController.cs b/src/Api/Public/Controllers/GroupsController.cs
index a761f3b33..ef29db568 100644
--- a/src/Api/Public/Controllers/GroupsController.cs
+++ b/src/Api/Public/Controllers/GroupsController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Public/Controllers/MembersController.cs b/src/Api/Public/Controllers/MembersController.cs
index d9fb9a479..bfe7f86b7 100644
--- a/src/Api/Public/Controllers/MembersController.cs
+++ b/src/Api/Public/Controllers/MembersController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Public/Controllers/OrganizationController.cs b/src/Api/Public/Controllers/OrganizationController.cs
index 21456789b..978811d39 100644
--- a/src/Api/Public/Controllers/OrganizationController.cs
+++ b/src/Api/Public/Controllers/OrganizationController.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Public/Controllers/PoliciesController.cs b/src/Api/Public/Controllers/PoliciesController.cs
index 4c9eb31bd..65556ebac 100644
--- a/src/Api/Public/Controllers/PoliciesController.cs
+++ b/src/Api/Public/Controllers/PoliciesController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.Context;
diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index c27d62e65..b86542bd5 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -1,9 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Bit.Api.Utilities;
+using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Identity;
@@ -14,9 +9,7 @@ using Bit.Core.Utilities;
 using IdentityModel;
 using System.Globalization;
 using Microsoft.IdentityModel.Logging;
-using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
-using System.Collections.Generic;
 using Bit.SharedWeb.Utilities;
 
 #if !OSS
diff --git a/src/Api/Utilities/ApiHelpers.cs b/src/Api/Utilities/ApiHelpers.cs
index c704aff39..920c15dd2 100644
--- a/src/Api/Utilities/ApiHelpers.cs
+++ b/src/Api/Utilities/ApiHelpers.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Messaging.EventGrid;
 using Azure.Messaging.EventGrid.SystemEvents;
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Utilities
diff --git a/src/Api/Utilities/DisableFormValueModelBindingAttribute.cs b/src/Api/Utilities/DisableFormValueModelBindingAttribute.cs
index d7ad9b78c..27169a57c 100644
--- a/src/Api/Utilities/DisableFormValueModelBindingAttribute.cs
+++ b/src/Api/Utilities/DisableFormValueModelBindingAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Bit.Api.Utilities
diff --git a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
index 4083531fc..846bcda25 100644
--- a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
+++ b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
@@ -1,12 +1,7 @@
-using System;
-using Bit.Api.Models.Public.Response;
+using Bit.Api.Models.Public.Response;
 using Bit.Core.Exceptions;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Stripe;
 using InternalApi = Bit.Core.Models.Api;
diff --git a/src/Api/Utilities/ModelStateValidationFilterAttribute.cs b/src/Api/Utilities/ModelStateValidationFilterAttribute.cs
index 749df7687..d6803f91c 100644
--- a/src/Api/Utilities/ModelStateValidationFilterAttribute.cs
+++ b/src/Api/Utilities/ModelStateValidationFilterAttribute.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Api.Models.Public.Response;
+using Bit.Api.Models.Public.Response;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using InternalApi = Bit.Core.Models.Api;
diff --git a/src/Api/Utilities/MultipartFormDataHelper.cs b/src/Api/Utilities/MultipartFormDataHelper.cs
index 0c1fcd1d1..a3e4b1967 100644
--- a/src/Api/Utilities/MultipartFormDataHelper.cs
+++ b/src/Api/Utilities/MultipartFormDataHelper.cs
@@ -1,9 +1,5 @@
-using System;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Api.Models.Request;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Primitives;
diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs
index 74a3ec208..4e57d5165 100644
--- a/src/Api/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Api/Utilities/ServiceCollectionExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
+using Bit.Core.Settings;
 using Microsoft.OpenApi.Models;
 
 namespace Bit.Api.Utilities
diff --git a/src/Billing/Controllers/AppleController.cs b/src/Billing/Controllers/AppleController.cs
index 0a45f6a32..dc8c82786 100644
--- a/src/Billing/Controllers/AppleController.cs
+++ b/src/Billing/Controllers/AppleController.cs
@@ -1,12 +1,7 @@
-using System;
-using System.IO;
-using System.Text;
+using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
-using Bit.Core;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/BitPayController.cs b/src/Billing/Controllers/BitPayController.cs
index 08d086735..520f00a22 100644
--- a/src/Billing/Controllers/BitPayController.cs
+++ b/src/Billing/Controllers/BitPayController.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Data.SqlClient;
+using System.Data.SqlClient;
 using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Billing.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -10,7 +7,6 @@ using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/FreshdeskController.cs b/src/Billing/Controllers/FreshdeskController.cs
index 158079b23..0e458198c 100644
--- a/src/Billing/Controllers/FreshdeskController.cs
+++ b/src/Billing/Controllers/FreshdeskController.cs
@@ -1,18 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
+using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/FreshsalesController.cs b/src/Billing/Controllers/FreshsalesController.cs
index f623e9796..866b95d17 100644
--- a/src/Billing/Controllers/FreshsalesController.cs
+++ b/src/Billing/Controllers/FreshsalesController.cs
@@ -1,19 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
+using System.Net.Http.Headers;
 using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/InfoController.cs b/src/Billing/Controllers/InfoController.cs
index 016bee2c4..5d7ce5754 100644
--- a/src/Billing/Controllers/InfoController.cs
+++ b/src/Billing/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/LoginController.cs b/src/Billing/Controllers/LoginController.cs
index c843fa54a..448e2b9b2 100644
--- a/src/Billing/Controllers/LoginController.cs
+++ b/src/Billing/Controllers/LoginController.cs
@@ -1,8 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Billing.Models;
-using Bit.Core.Identity;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Billing.Controllers
 {
diff --git a/src/Billing/Controllers/PayPalController.cs b/src/Billing/Controllers/PayPalController.cs
index a8f8a694e..64811b5ae 100644
--- a/src/Billing/Controllers/PayPalController.cs
+++ b/src/Billing/Controllers/PayPalController.cs
@@ -1,7 +1,5 @@
 using System.Data.SqlClient;
-using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using Bit.Billing.Utilities;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -9,7 +7,6 @@ using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Bit.Billing.Controllers
diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs
index 1581fc654..c39acce24 100644
--- a/src/Billing/Controllers/StripeController.cs
+++ b/src/Billing/Controllers/StripeController.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Data.SqlClient;
 using Bit.Billing.Constants;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -13,10 +8,7 @@ using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Stripe;
 using TaxRate = Bit.Core.Entities.TaxRate;
diff --git a/src/Billing/Jobs/JobsHostedService.cs b/src/Billing/Jobs/JobsHostedService.cs
index 8b2606e51..ea91924a1 100644
--- a/src/Billing/Jobs/JobsHostedService.cs
+++ b/src/Billing/Jobs/JobsHostedService.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using Bit.Core.Jobs;
 using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Billing.Jobs
diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs
index 3407bf707..7b42ad73f 100644
--- a/src/Billing/Program.cs
+++ b/src/Billing/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Billing
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index bfdb1d5bb..ab11b82e5 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using Bit.Core.Context;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
 using Stripe;
 
 namespace Bit.Billing
diff --git a/src/Billing/Utilities/PayPalIpnClient.cs b/src/Billing/Utilities/PayPalIpnClient.cs
index cd95e5a90..2a7b0e852 100644
--- a/src/Billing/Utilities/PayPalIpnClient.cs
+++ b/src/Billing/Utilities/PayPalIpnClient.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Core/Context/CurrentContentOrganization.cs b/src/Core/Context/CurrentContentOrganization.cs
index b915408ff..7a54b2727 100644
--- a/src/Core/Context/CurrentContentOrganization.cs
+++ b/src/Core/Context/CurrentContentOrganization.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
diff --git a/src/Core/Context/CurrentContentProvider.cs b/src/Core/Context/CurrentContentProvider.cs
index 2b4998ed7..f1925f551 100644
--- a/src/Core/Context/CurrentContentProvider.cs
+++ b/src/Core/Context/CurrentContentProvider.cs
@@ -1,6 +1,4 @@
-using System;
-using Bit.Core.Entities.Provider;
-using Bit.Core.Enums;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs
index c34a33530..c6d4ca00a 100644
--- a/src/Core/Context/CurrentContext.cs
+++ b/src/Core/Context/CurrentContext.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
diff --git a/src/Core/Context/ICurrentContext.cs b/src/Core/Context/ICurrentContext.cs
index d94c7232b..3d0b8c855 100644
--- a/src/Core/Context/ICurrentContext.cs
+++ b/src/Core/Context/ICurrentContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Core/Entities/Cipher.cs b/src/Core/Entities/Cipher.cs
index fa19b47d9..c4e57aa76 100644
--- a/src/Core/Entities/Cipher.cs
+++ b/src/Core/Entities/Cipher.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/Collection.cs b/src/Core/Entities/Collection.cs
index e955468d3..fb6e646fc 100644
--- a/src/Core/Entities/Collection.cs
+++ b/src/Core/Entities/Collection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities
diff --git a/src/Core/Entities/CollectionCipher.cs b/src/Core/Entities/CollectionCipher.cs
index 16ba2297e..f04c2bdf4 100644
--- a/src/Core/Entities/CollectionCipher.cs
+++ b/src/Core/Entities/CollectionCipher.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public class CollectionCipher
     {
diff --git a/src/Core/Entities/CollectionGroup.cs b/src/Core/Entities/CollectionGroup.cs
index fa3427f82..c68ae3005 100644
--- a/src/Core/Entities/CollectionGroup.cs
+++ b/src/Core/Entities/CollectionGroup.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public class CollectionGroup
     {
diff --git a/src/Core/Entities/CollectionUser.cs b/src/Core/Entities/CollectionUser.cs
index 195fd5228..5b5d01fcc 100644
--- a/src/Core/Entities/CollectionUser.cs
+++ b/src/Core/Entities/CollectionUser.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public class CollectionUser
     {
diff --git a/src/Core/Entities/Device.cs b/src/Core/Entities/Device.cs
index b5c48a131..9cca56c3f 100644
--- a/src/Core/Entities/Device.cs
+++ b/src/Core/Entities/Device.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities
diff --git a/src/Core/Entities/EmergencyAccess.cs b/src/Core/Entities/EmergencyAccess.cs
index 7d6f650dc..eafd9ee8e 100644
--- a/src/Core/Entities/EmergencyAccess.cs
+++ b/src/Core/Entities/EmergencyAccess.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/Event.cs b/src/Core/Entities/Event.cs
index 1288b0438..d17116ce6 100644
--- a/src/Core/Entities/Event.cs
+++ b/src/Core/Entities/Event.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
diff --git a/src/Core/Entities/Folder.cs b/src/Core/Entities/Folder.cs
index 3fcce1aab..5fc97a3e5 100644
--- a/src/Core/Entities/Folder.cs
+++ b/src/Core/Entities/Folder.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities
 {
diff --git a/src/Core/Entities/Grant.cs b/src/Core/Entities/Grant.cs
index ed20b336f..f2bd464fb 100644
--- a/src/Core/Entities/Grant.cs
+++ b/src/Core/Entities/Grant.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Entities
 {
diff --git a/src/Core/Entities/Group.cs b/src/Core/Entities/Group.cs
index 5f8eb3bad..0ca760cff 100644
--- a/src/Core/Entities/Group.cs
+++ b/src/Core/Entities/Group.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/GroupUser.cs b/src/Core/Entities/GroupUser.cs
index 07e3fbde2..c7933d5e7 100644
--- a/src/Core/Entities/GroupUser.cs
+++ b/src/Core/Entities/GroupUser.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public class GroupUser
     {
diff --git a/src/Core/Entities/IReferenceable.cs b/src/Core/Entities/IReferenceable.cs
index 562f686ef..a5373978d 100644
--- a/src/Core/Entities/IReferenceable.cs
+++ b/src/Core/Entities/IReferenceable.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public interface IReferenceable
     {
diff --git a/src/Core/Entities/IRevisable.cs b/src/Core/Entities/IRevisable.cs
index ca29146f0..6de7478c0 100644
--- a/src/Core/Entities/IRevisable.cs
+++ b/src/Core/Entities/IRevisable.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public interface IRevisable
     {
diff --git a/src/Core/Entities/ISubscriber.cs b/src/Core/Entities/ISubscriber.cs
index 232b7978f..1c80ffc20 100644
--- a/src/Core/Entities/ISubscriber.cs
+++ b/src/Core/Entities/ISubscriber.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Entities
 {
diff --git a/src/Core/Entities/ITableObject.cs b/src/Core/Entities/ITableObject.cs
index 7c86e4abe..f9ecb864b 100644
--- a/src/Core/Entities/ITableObject.cs
+++ b/src/Core/Entities/ITableObject.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Entities
+namespace Bit.Core.Entities
 {
     public interface ITableObject<T> where T : IEquatable<T>
     {
diff --git a/src/Core/Entities/Installation.cs b/src/Core/Entities/Installation.cs
index c0f056e50..36966d861 100644
--- a/src/Core/Entities/Installation.cs
+++ b/src/Core/Entities/Installation.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities
diff --git a/src/Core/Entities/Organization.cs b/src/Core/Entities/Organization.cs
index dd19fd008..19ed28091 100644
--- a/src/Core/Entities/Organization.cs
+++ b/src/Core/Entities/Organization.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Entities/OrganizationApiKey.cs b/src/Core/Entities/OrganizationApiKey.cs
index 0eb5b527a..f3a71bde2 100644
--- a/src/Core/Entities/OrganizationApiKey.cs
+++ b/src/Core/Entities/OrganizationApiKey.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/OrganizationConnection.cs b/src/Core/Entities/OrganizationConnection.cs
index 9e79e82de..804913fd6 100644
--- a/src/Core/Entities/OrganizationConnection.cs
+++ b/src/Core/Entities/OrganizationConnection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/OrganizationSponsorship.cs b/src/Core/Entities/OrganizationSponsorship.cs
index c975feaf6..27d07e8f7 100644
--- a/src/Core/Entities/OrganizationSponsorship.cs
+++ b/src/Core/Entities/OrganizationSponsorship.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/OrganizationUser.cs b/src/Core/Entities/OrganizationUser.cs
index 4034ca5a7..390374dec 100644
--- a/src/Core/Entities/OrganizationUser.cs
+++ b/src/Core/Entities/OrganizationUser.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Utilities;
diff --git a/src/Core/Entities/Policy.cs b/src/Core/Entities/Policy.cs
index b721ed01e..7a5f95871 100644
--- a/src/Core/Entities/Policy.cs
+++ b/src/Core/Entities/Policy.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/Provider/Provider.cs b/src/Core/Entities/Provider/Provider.cs
index a9848bfd5..95da01f93 100644
--- a/src/Core/Entities/Provider/Provider.cs
+++ b/src/Core/Entities/Provider/Provider.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities.Provider
diff --git a/src/Core/Entities/Provider/ProviderOrganization.cs b/src/Core/Entities/Provider/ProviderOrganization.cs
index 5d93df221..6bb1eec54 100644
--- a/src/Core/Entities/Provider/ProviderOrganization.cs
+++ b/src/Core/Entities/Provider/ProviderOrganization.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities.Provider
 {
diff --git a/src/Core/Entities/Provider/ProviderUser.cs b/src/Core/Entities/Provider/ProviderUser.cs
index 61002f000..c3d0582da 100644
--- a/src/Core/Entities/Provider/ProviderUser.cs
+++ b/src/Core/Entities/Provider/ProviderUser.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Entities.Provider
diff --git a/src/Core/Entities/Send.cs b/src/Core/Entities/Send.cs
index c921eb486..cbe2006e8 100644
--- a/src/Core/Entities/Send.cs
+++ b/src/Core/Entities/Send.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/SsoConfig.cs b/src/Core/Entities/SsoConfig.cs
index 4b3bf7d7e..63bf9173c 100644
--- a/src/Core/Entities/SsoConfig.cs
+++ b/src/Core/Entities/SsoConfig.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Entities
 {
diff --git a/src/Core/Entities/SsoUser.cs b/src/Core/Entities/SsoUser.cs
index f02d02727..47818e2bd 100644
--- a/src/Core/Entities/SsoUser.cs
+++ b/src/Core/Entities/SsoUser.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Entities
 {
diff --git a/src/Core/Entities/Transaction.cs b/src/Core/Entities/Transaction.cs
index 68d416c52..b2a01908c 100644
--- a/src/Core/Entities/Transaction.cs
+++ b/src/Core/Entities/Transaction.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Entities/User.cs b/src/Core/Entities/User.cs
index a434a82fd..e5d79c722 100644
--- a/src/Core/Entities/User.cs
+++ b/src/Core/Entities/User.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Exceptions/BadRequestException.cs b/src/Core/Exceptions/BadRequestException.cs
index bc9b3e267..686bf786c 100644
--- a/src/Core/Exceptions/BadRequestException.cs
+++ b/src/Core/Exceptions/BadRequestException.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Bit.Core.Exceptions
 {
diff --git a/src/Core/Exceptions/GatewayException.cs b/src/Core/Exceptions/GatewayException.cs
index 8c2949fec..d97511a68 100644
--- a/src/Core/Exceptions/GatewayException.cs
+++ b/src/Core/Exceptions/GatewayException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Exceptions
+namespace Bit.Core.Exceptions
 {
     public class GatewayException : Exception
     {
diff --git a/src/Core/Exceptions/InvalidEmailException.cs b/src/Core/Exceptions/InvalidEmailException.cs
index 52a89e523..64ede1fdb 100644
--- a/src/Core/Exceptions/InvalidEmailException.cs
+++ b/src/Core/Exceptions/InvalidEmailException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Exceptions
+namespace Bit.Core.Exceptions
 {
     public class InvalidEmailException : Exception
     {
diff --git a/src/Core/Exceptions/InvalidGatewayCustomerIdException.cs b/src/Core/Exceptions/InvalidGatewayCustomerIdException.cs
index 43f641d7e..ad3a4544a 100644
--- a/src/Core/Exceptions/InvalidGatewayCustomerIdException.cs
+++ b/src/Core/Exceptions/InvalidGatewayCustomerIdException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Exceptions
+namespace Bit.Core.Exceptions
 {
     public class InvalidGatewayCustomerIdException : Exception
     {
diff --git a/src/Core/Exceptions/NotFoundException.cs b/src/Core/Exceptions/NotFoundException.cs
index 75d43a2e4..a47023093 100644
--- a/src/Core/Exceptions/NotFoundException.cs
+++ b/src/Core/Exceptions/NotFoundException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Exceptions
+namespace Bit.Core.Exceptions
 {
     public class NotFoundException : Exception { }
 }
diff --git a/src/Core/HostedServices/ApplicationCacheHostedService.cs b/src/Core/HostedServices/ApplicationCacheHostedService.cs
index 20117f6be..a5a27e5de 100644
--- a/src/Core/HostedServices/ApplicationCacheHostedService.cs
+++ b/src/Core/HostedServices/ApplicationCacheHostedService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
diff --git a/src/Core/Identity/AuthenticatorTokenProvider.cs b/src/Core/Identity/AuthenticatorTokenProvider.cs
index cd5e75d95..5eef3869d 100644
--- a/src/Core/Identity/AuthenticatorTokenProvider.cs
+++ b/src/Core/Identity/AuthenticatorTokenProvider.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Identity;
diff --git a/src/Core/Identity/CustomIdentityServiceCollectionExtensions.cs b/src/Core/Identity/CustomIdentityServiceCollectionExtensions.cs
index 8965b621c..0acb4a3f4 100644
--- a/src/Core/Identity/CustomIdentityServiceCollectionExtensions.cs
+++ b/src/Core/Identity/CustomIdentityServiceCollectionExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using Bit.Core.Identity;
-using Microsoft.AspNetCore.Http;
+using Bit.Core.Identity;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
diff --git a/src/Core/Identity/DuoWebTokenProvider.cs b/src/Core/Identity/DuoWebTokenProvider.cs
index 6f2a1d849..3ef02df6f 100644
--- a/src/Core/Identity/DuoWebTokenProvider.cs
+++ b/src/Core/Identity/DuoWebTokenProvider.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Services;
diff --git a/src/Core/Identity/EmailTokenProvider.cs b/src/Core/Identity/EmailTokenProvider.cs
index c0a2270b3..a0002b47f 100644
--- a/src/Core/Identity/EmailTokenProvider.cs
+++ b/src/Core/Identity/EmailTokenProvider.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Services;
diff --git a/src/Core/Identity/IOrganizationTwoFactorTokenProvider.cs b/src/Core/Identity/IOrganizationTwoFactorTokenProvider.cs
index 57e366bc4..11157a783 100644
--- a/src/Core/Identity/IOrganizationTwoFactorTokenProvider.cs
+++ b/src/Core/Identity/IOrganizationTwoFactorTokenProvider.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Identity
 {
diff --git a/src/Core/Identity/OrganizationDuoWebTokenProvider.cs b/src/Core/Identity/OrganizationDuoWebTokenProvider.cs
index 3d78181d2..cd3f27184 100644
--- a/src/Core/Identity/OrganizationDuoWebTokenProvider.cs
+++ b/src/Core/Identity/OrganizationDuoWebTokenProvider.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Settings;
diff --git a/src/Core/Identity/PasswordlessSignInManager.cs b/src/Core/Identity/PasswordlessSignInManager.cs
index e69e248ea..a9f400058 100644
--- a/src/Core/Identity/PasswordlessSignInManager.cs
+++ b/src/Core/Identity/PasswordlessSignInManager.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
diff --git a/src/Core/Identity/ReadOnlyDatabaseIdentityUserStore.cs b/src/Core/Identity/ReadOnlyDatabaseIdentityUserStore.cs
index 82fcc5b50..7f4b76755 100644
--- a/src/Core/Identity/ReadOnlyDatabaseIdentityUserStore.cs
+++ b/src/Core/Identity/ReadOnlyDatabaseIdentityUserStore.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Identity;
 
diff --git a/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs b/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs
index 8897a5bb9..26cc7a3c8 100644
--- a/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs
+++ b/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 
diff --git a/src/Core/Identity/ReadOnlyIdentityUserStore.cs b/src/Core/Identity/ReadOnlyIdentityUserStore.cs
index 14b4244d0..d27b0a32f 100644
--- a/src/Core/Identity/ReadOnlyIdentityUserStore.cs
+++ b/src/Core/Identity/ReadOnlyIdentityUserStore.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 
 namespace Bit.Core.Identity
 {
diff --git a/src/Core/Identity/RoleStore.cs b/src/Core/Identity/RoleStore.cs
index 62ae46203..f96748f24 100644
--- a/src/Core/Identity/RoleStore.cs
+++ b/src/Core/Identity/RoleStore.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Microsoft.AspNetCore.Identity;
 
 namespace Bit.Core.Identity
diff --git a/src/Core/Identity/UserStore.cs b/src/Core/Identity/UserStore.cs
index 7a11ef95e..53bd74484 100644
--- a/src/Core/Identity/UserStore.cs
+++ b/src/Core/Identity/UserStore.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Settings;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/Core/Identity/WebAuthnTokenProvider.cs b/src/Core/Identity/WebAuthnTokenProvider.cs
index 40466f541..ee857422a 100644
--- a/src/Core/Identity/WebAuthnTokenProvider.cs
+++ b/src/Core/Identity/WebAuthnTokenProvider.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Identity/YubicoOtpTokenProvider.cs b/src/Core/Identity/YubicoOtpTokenProvider.cs
index f0ab573c4..763cdbf4b 100644
--- a/src/Core/Identity/YubicoOtpTokenProvider.cs
+++ b/src/Core/Identity/YubicoOtpTokenProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Settings;
diff --git a/src/Core/IdentityServer/ApiClient.cs b/src/Core/IdentityServer/ApiClient.cs
index 56c2e2037..a17bb32f9 100644
--- a/src/Core/IdentityServer/ApiClient.cs
+++ b/src/Core/IdentityServer/ApiClient.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
diff --git a/src/Core/IdentityServer/ApiResources.cs b/src/Core/IdentityServer/ApiResources.cs
index 669f6bbb0..55b3427cd 100644
--- a/src/Core/IdentityServer/ApiResources.cs
+++ b/src/Core/IdentityServer/ApiResources.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using IdentityModel;
+using IdentityModel;
 using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
diff --git a/src/Core/IdentityServer/ApiScopes.cs b/src/Core/IdentityServer/ApiScopes.cs
index 1faadb00a..e98465964 100644
--- a/src/Core/IdentityServer/ApiScopes.cs
+++ b/src/Core/IdentityServer/ApiScopes.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using IdentityServer4.Models;
+using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
 {
diff --git a/src/Core/IdentityServer/AuthorizationCodeStore.cs b/src/Core/IdentityServer/AuthorizationCodeStore.cs
index 9ae7300e6..7bf01f6eb 100644
--- a/src/Core/IdentityServer/AuthorizationCodeStore.cs
+++ b/src/Core/IdentityServer/AuthorizationCodeStore.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using IdentityServer4;
+using IdentityServer4;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
diff --git a/src/Core/IdentityServer/BaseRequestValidator.cs b/src/Core/IdentityServer/BaseRequestValidator.cs
index a4773d49c..632b548b2 100644
--- a/src/Core/IdentityServer/BaseRequestValidator.cs
+++ b/src/Core/IdentityServer/BaseRequestValidator.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using System.Security.Claims;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/IdentityServer/ClientStore.cs b/src/Core/IdentityServer/ClientStore.cs
index 7796ea46d..ebe247f19 100644
--- a/src/Core/IdentityServer/ClientStore.cs
+++ b/src/Core/IdentityServer/ClientStore.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
+using System.Collections.ObjectModel;
 using System.Security.Claims;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs
index 2e5826f6f..3b1c390a8 100644
--- a/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs
+++ b/src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using IdentityServer4.Configuration;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Core/IdentityServer/CustomTokenRequestValidator.cs b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
index cea01ba01..f37e165f3 100644
--- a/src/Core/IdentityServer/CustomTokenRequestValidator.cs
+++ b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Identity;
-using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
diff --git a/src/Core/IdentityServer/DistributedCacheCookieManager.cs b/src/Core/IdentityServer/DistributedCacheCookieManager.cs
index e18f5742a..988afc018 100644
--- a/src/Core/IdentityServer/DistributedCacheCookieManager.cs
+++ b/src/Core/IdentityServer/DistributedCacheCookieManager.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Distributed;
diff --git a/src/Core/IdentityServer/DistributedCacheTicketDataFormatter.cs b/src/Core/IdentityServer/DistributedCacheTicketDataFormatter.cs
index c1f6570b2..bbd1d4087 100644
--- a/src/Core/IdentityServer/DistributedCacheTicketDataFormatter.cs
+++ b/src/Core/IdentityServer/DistributedCacheTicketDataFormatter.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Distributed;
diff --git a/src/Core/IdentityServer/MemoryCacheTicketStore.cs b/src/Core/IdentityServer/MemoryCacheTicketStore.cs
index 7508ef25a..7120aee07 100644
--- a/src/Core/IdentityServer/MemoryCacheTicketStore.cs
+++ b/src/Core/IdentityServer/MemoryCacheTicketStore.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.Extensions.Caching.Memory;
 
diff --git a/src/Core/IdentityServer/OidcIdentityClient.cs b/src/Core/IdentityServer/OidcIdentityClient.cs
index 6bc7c5d46..7f24f66e2 100644
--- a/src/Core/IdentityServer/OidcIdentityClient.cs
+++ b/src/Core/IdentityServer/OidcIdentityClient.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using IdentityServer4;
 using IdentityServer4.Models;
 
diff --git a/src/Core/IdentityServer/PersistedGrantStore.cs b/src/Core/IdentityServer/PersistedGrantStore.cs
index 67a38f717..7094265e7 100644
--- a/src/Core/IdentityServer/PersistedGrantStore.cs
+++ b/src/Core/IdentityServer/PersistedGrantStore.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 using Grant = Bit.Core.Entities.Grant;
diff --git a/src/Core/IdentityServer/ProfileService.cs b/src/Core/IdentityServer/ProfileService.cs
index 353fa8778..aa79c60d1 100644
--- a/src/Core/IdentityServer/ProfileService.cs
+++ b/src/Core/IdentityServer/ProfileService.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Context;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Settings;
 using Bit.Core.Utilities;
-using IdentityModel;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
 
diff --git a/src/Core/IdentityServer/RedisCacheTicketStore.cs b/src/Core/IdentityServer/RedisCacheTicketStore.cs
index 65ae58c2d..eaec72a44 100644
--- a/src/Core/IdentityServer/RedisCacheTicketStore.cs
+++ b/src/Core/IdentityServer/RedisCacheTicketStore.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
diff --git a/src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs b/src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
index 44b88d729..f83143141 100644
--- a/src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
+++ b/src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Identity;
diff --git a/src/Core/IdentityServer/StaticClientStore.cs b/src/Core/IdentityServer/StaticClientStore.cs
index 4007488ff..60bff26e7 100644
--- a/src/Core/IdentityServer/StaticClientStore.cs
+++ b/src/Core/IdentityServer/StaticClientStore.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Settings;
 using IdentityServer4.Models;
 
diff --git a/src/Core/IdentityServer/TokenRetrieval.cs b/src/Core/IdentityServer/TokenRetrieval.cs
index 6ae1b2814..7290576f0 100644
--- a/src/Core/IdentityServer/TokenRetrieval.cs
+++ b/src/Core/IdentityServer/TokenRetrieval.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace Bit.Core.IdentityServer
 {
diff --git a/src/Core/IdentityServer/VaultCorsPolicyService.cs b/src/Core/IdentityServer/VaultCorsPolicyService.cs
index 3fd9ffe30..42b76135e 100644
--- a/src/Core/IdentityServer/VaultCorsPolicyService.cs
+++ b/src/Core/IdentityServer/VaultCorsPolicyService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using IdentityServer4.Services;
 
diff --git a/src/Core/Jobs/BaseJob.cs b/src/Core/Jobs/BaseJob.cs
index 2e198dfb2..c1eb7d264 100644
--- a/src/Core/Jobs/BaseJob.cs
+++ b/src/Core/Jobs/BaseJob.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Core.Jobs
diff --git a/src/Core/Jobs/BaseJobsHostedService.cs b/src/Core/Jobs/BaseJobsHostedService.cs
index 4bd384664..c9d2bda1c 100644
--- a/src/Core/Jobs/BaseJobsHostedService.cs
+++ b/src/Core/Jobs/BaseJobsHostedService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Specialized;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
diff --git a/src/Core/Jobs/JobFactory.cs b/src/Core/Jobs/JobFactory.cs
index 2cd42035e..00cf63b26 100644
--- a/src/Core/Jobs/JobFactory.cs
+++ b/src/Core/Jobs/JobFactory.cs
@@ -1,5 +1,4 @@
-using System;
-using Quartz;
+using Quartz;
 using Quartz.Spi;
 
 namespace Bit.Core.Jobs
diff --git a/src/Core/Jobs/JobListener.cs b/src/Core/Jobs/JobListener.cs
index 16c08e072..8fb56828e 100644
--- a/src/Core/Jobs/JobListener.cs
+++ b/src/Core/Jobs/JobListener.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Core.Jobs
diff --git a/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs b/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
index 407acbe75..2b7c36a89 100644
--- a/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
+++ b/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipRequestModel.cs b/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipRequestModel.cs
index 05a9be10c..7440e7ba3 100644
--- a/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipRequestModel.cs
+++ b/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipRequestModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
 
diff --git a/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipSyncRequestModel.cs b/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipSyncRequestModel.cs
index faa649841..9def44d60 100644
--- a/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipSyncRequestModel.cs
+++ b/src/Core/Models/Api/Request/OrganizationSponsorships/OrganizationSponsorshipSyncRequestModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
+using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
 
 namespace Bit.Core.Models.Api.Request.OrganizationSponsorships
 {
diff --git a/src/Core/Models/Api/Request/PushSendRequestModel.cs b/src/Core/Models/Api/Request/PushSendRequestModel.cs
index e54465317..108db5804 100644
--- a/src/Core/Models/Api/Request/PushSendRequestModel.cs
+++ b/src/Core/Models/Api/Request/PushSendRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Api
diff --git a/src/Core/Models/Api/Request/PushUpdateRequestModel.cs b/src/Core/Models/Api/Request/PushUpdateRequestModel.cs
index dc71a5d10..ba5c3bf96 100644
--- a/src/Core/Models/Api/Request/PushUpdateRequestModel.cs
+++ b/src/Core/Models/Api/Request/PushUpdateRequestModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Models.Api
 {
diff --git a/src/Core/Models/Api/Response/ErrorResponseModel.cs b/src/Core/Models/Api/Response/ErrorResponseModel.cs
index ec73483f3..e7f77099c 100644
--- a/src/Core/Models/Api/Response/ErrorResponseModel.cs
+++ b/src/Core/Models/Api/Response/ErrorResponseModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Bit.Core.Models.Api
 {
diff --git a/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipResponseModel.cs b/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipResponseModel.cs
index c14a4cd80..fc5fbc70d 100644
--- a/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipResponseModel.cs
+++ b/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipResponseModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
 
 namespace Bit.Core.Models.Api.Response.OrganizationSponsorships
diff --git a/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipSyncResponseModel.cs b/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipSyncResponseModel.cs
index 8878731f2..4d44ab165 100644
--- a/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipSyncResponseModel.cs
+++ b/src/Core/Models/Api/Response/OrganizationSponsorships/OrganizationSponsorshipSyncResponseModel.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
-using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
+using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
 
 namespace Bit.Core.Models.Api.Response.OrganizationSponsorships
 {
diff --git a/src/Core/Models/Api/Response/ResponseModel.cs b/src/Core/Models/Api/Response/ResponseModel.cs
index 16a49f773..539d52d10 100644
--- a/src/Core/Models/Api/Response/ResponseModel.cs
+++ b/src/Core/Models/Api/Response/ResponseModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Api
 {
diff --git a/src/Core/Models/Business/AppleReceiptStatus.cs b/src/Core/Models/Business/AppleReceiptStatus.cs
index fc7fce533..26f7537af 100644
--- a/src/Core/Models/Business/AppleReceiptStatus.cs
+++ b/src/Core/Models/Business/AppleReceiptStatus.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
diff --git a/src/Core/Models/Business/BillingInfo.cs b/src/Core/Models/Business/BillingInfo.cs
index dab20541f..557a3288f 100644
--- a/src/Core/Models/Business/BillingInfo.cs
+++ b/src/Core/Models/Business/BillingInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Stripe;
 
diff --git a/src/Core/Models/Business/ExpiringToken.cs b/src/Core/Models/Business/ExpiringToken.cs
index 3de031a5c..3ed16a1cf 100644
--- a/src/Core/Models/Business/ExpiringToken.cs
+++ b/src/Core/Models/Business/ExpiringToken.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Business
+namespace Bit.Core.Models.Business
 {
     public class ExpiringToken
     {
diff --git a/src/Core/Models/Business/ILicense.cs b/src/Core/Models/Business/ILicense.cs
index e96c1f530..0e03e41c6 100644
--- a/src/Core/Models/Business/ILicense.cs
+++ b/src/Core/Models/Business/ILicense.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 
 namespace Bit.Core.Models.Business
 {
diff --git a/src/Core/Models/Business/ImportedGroup.cs b/src/Core/Models/Business/ImportedGroup.cs
index 38bf1ff81..ee4589dfa 100644
--- a/src/Core/Models/Business/ImportedGroup.cs
+++ b/src/Core/Models/Business/ImportedGroup.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Business
 {
diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Models/Business/OrganizationLicense.cs
index 2cf830b70..f9fe2eccd 100644
--- a/src/Core/Models/Business/OrganizationLicense.cs
+++ b/src/Core/Models/Business/OrganizationLicense.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
diff --git a/src/Core/Models/Business/OrganizationUserInvite.cs b/src/Core/Models/Business/OrganizationUserInvite.cs
index 8ea491157..8e7f6f865 100644
--- a/src/Core/Models/Business/OrganizationUserInvite.cs
+++ b/src/Core/Models/Business/OrganizationUserInvite.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Core.Models.Business
diff --git a/src/Core/Models/Business/Provider/ProviderUserInvite.cs b/src/Core/Models/Business/Provider/ProviderUserInvite.cs
index 782f3a2c3..39f609479 100644
--- a/src/Core/Models/Business/Provider/ProviderUserInvite.cs
+++ b/src/Core/Models/Business/Provider/ProviderUserInvite.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 
 namespace Bit.Core.Models.Business.Provider
 {
diff --git a/src/Core/Models/Business/ReferenceEvent.cs b/src/Core/Models/Business/ReferenceEvent.cs
index ea6368ae3..35cb5dc73 100644
--- a/src/Core/Models/Business/ReferenceEvent.cs
+++ b/src/Core/Models/Business/ReferenceEvent.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
diff --git a/src/Core/Models/Business/SubscriptionCreateOptions.cs b/src/Core/Models/Business/SubscriptionCreateOptions.cs
index 63bbdfbb7..e78aaeda0 100644
--- a/src/Core/Models/Business/SubscriptionCreateOptions.cs
+++ b/src/Core/Models/Business/SubscriptionCreateOptions.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Stripe;
 
 namespace Bit.Core.Models.Business
diff --git a/src/Core/Models/Business/SubscriptionInfo.cs b/src/Core/Models/Business/SubscriptionInfo.cs
index b648dcb57..e8e339db8 100644
--- a/src/Core/Models/Business/SubscriptionInfo.cs
+++ b/src/Core/Models/Business/SubscriptionInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Stripe;
+using Stripe;
 
 namespace Bit.Core.Models.Business
 {
diff --git a/src/Core/Models/Business/SubscriptionUpdate.cs b/src/Core/Models/Business/SubscriptionUpdate.cs
index 94a08b6dd..56902524d 100644
--- a/src/Core/Models/Business/SubscriptionUpdate.cs
+++ b/src/Core/Models/Business/SubscriptionUpdate.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Stripe;
 
 namespace Bit.Core.Models.Business
diff --git a/src/Core/Models/Business/Tokenables/EmergencyAccessInviteTokenable.cs b/src/Core/Models/Business/Tokenables/EmergencyAccessInviteTokenable.cs
index b8cf0be04..f8d7b02b7 100644
--- a/src/Core/Models/Business/Tokenables/EmergencyAccessInviteTokenable.cs
+++ b/src/Core/Models/Business/Tokenables/EmergencyAccessInviteTokenable.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Business.Tokenables
diff --git a/src/Core/Models/Business/Tokenables/HCaptchaTokenable.cs b/src/Core/Models/Business/Tokenables/HCaptchaTokenable.cs
index 0d5a1a018..774df7d79 100644
--- a/src/Core/Models/Business/Tokenables/HCaptchaTokenable.cs
+++ b/src/Core/Models/Business/Tokenables/HCaptchaTokenable.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Tokens;
 
diff --git a/src/Core/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenable.cs b/src/Core/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenable.cs
index 206471402..0360f3542 100644
--- a/src/Core/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenable.cs
+++ b/src/Core/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenable.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Tokens;
diff --git a/src/Core/Models/Business/Tokenables/SsoTokenable.cs b/src/Core/Models/Business/Tokenables/SsoTokenable.cs
index 3eb9b1ae6..765e6ce59 100644
--- a/src/Core/Models/Business/Tokenables/SsoTokenable.cs
+++ b/src/Core/Models/Business/Tokenables/SsoTokenable.cs
@@ -1,6 +1,4 @@
-
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Entities;
 using Bit.Core.Tokens;
 
diff --git a/src/Core/Models/Business/UserLicense.cs b/src/Core/Models/Business/UserLicense.cs
index f3c27e2cc..183bf9576 100644
--- a/src/Core/Models/Business/UserLicense.cs
+++ b/src/Core/Models/Business/UserLicense.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
diff --git a/src/Core/Models/Data/CipherAttachment.cs b/src/Core/Models/Data/CipherAttachment.cs
index b9be06b44..a306c76ad 100644
--- a/src/Core/Models/Data/CipherAttachment.cs
+++ b/src/Core/Models/Data/CipherAttachment.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/CipherData.cs b/src/Core/Models/Data/CipherData.cs
index 72d10d757..3c7598f26 100644
--- a/src/Core/Models/Data/CipherData.cs
+++ b/src/Core/Models/Data/CipherData.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public abstract class CipherData
     {
diff --git a/src/Core/Models/Data/CipherDetails.cs b/src/Core/Models/Data/CipherDetails.cs
index 7098cd8b8..e7276ac3c 100644
--- a/src/Core/Models/Data/CipherDetails.cs
+++ b/src/Core/Models/Data/CipherDetails.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Core.Models.Data
+namespace Core.Models.Data
 {
     public class CipherDetails : CipherOrganizationDetails
     {
diff --git a/src/Core/Models/Data/CipherLoginData.cs b/src/Core/Models/Data/CipherLoginData.cs
index c200f99e5..2a98ff155 100644
--- a/src/Core/Models/Data/CipherLoginData.cs
+++ b/src/Core/Models/Data/CipherLoginData.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/CipherPasswordHistoryData.cs b/src/Core/Models/Data/CipherPasswordHistoryData.cs
index a3e342607..2362572a1 100644
--- a/src/Core/Models/Data/CipherPasswordHistoryData.cs
+++ b/src/Core/Models/Data/CipherPasswordHistoryData.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public class CipherPasswordHistoryData
     {
diff --git a/src/Core/Models/Data/DictionaryEntity.cs b/src/Core/Models/Data/DictionaryEntity.cs
index 7e7cf97fa..00b85d6a2 100644
--- a/src/Core/Models/Data/DictionaryEntity.cs
+++ b/src/Core/Models/Data/DictionaryEntity.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
 using Microsoft.Azure.Cosmos.Table;
 
 namespace Bit.Core.Models.Data
diff --git a/src/Core/Models/Data/EmergencyAccessNotify.cs b/src/Core/Models/Data/EmergencyAccessNotify.cs
index 3f1e68602..4661a1b49 100644
--- a/src/Core/Models/Data/EmergencyAccessNotify.cs
+++ b/src/Core/Models/Data/EmergencyAccessNotify.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/EmergencyAccessViewData.cs b/src/Core/Models/Data/EmergencyAccessViewData.cs
index b5bcf0a95..86260e823 100644
--- a/src/Core/Models/Data/EmergencyAccessViewData.cs
+++ b/src/Core/Models/Data/EmergencyAccessViewData.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Core.Models.Data;
 
 namespace Bit.Core.Models.Data
diff --git a/src/Core/Models/Data/EventMessage.cs b/src/Core/Models/Data/EventMessage.cs
index 31508a865..f99330d01 100644
--- a/src/Core/Models/Data/EventMessage.cs
+++ b/src/Core/Models/Data/EventMessage.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data
diff --git a/src/Core/Models/Data/EventTableEntity.cs b/src/Core/Models/Data/EventTableEntity.cs
index a6a3541a4..83e25b296 100644
--- a/src/Core/Models/Data/EventTableEntity.cs
+++ b/src/Core/Models/Data/EventTableEntity.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using Microsoft.Azure.Cosmos.Table;
 
diff --git a/src/Core/Models/Data/IEvent.cs b/src/Core/Models/Data/IEvent.cs
index 400a3bfcc..860c6d446 100644
--- a/src/Core/Models/Data/IEvent.cs
+++ b/src/Core/Models/Data/IEvent.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/InstallationDeviceEntity.cs b/src/Core/Models/Data/InstallationDeviceEntity.cs
index 76d0b4a23..0fb81e340 100644
--- a/src/Core/Models/Data/InstallationDeviceEntity.cs
+++ b/src/Core/Models/Data/InstallationDeviceEntity.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/Organizations/OrganizationAbility.cs b/src/Core/Models/Data/Organizations/OrganizationAbility.cs
index d2d12f04c..c70b03c49 100644
--- a/src/Core/Models/Data/Organizations/OrganizationAbility.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationAbility.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data.Organizations
 {
diff --git a/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs b/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs
index c71f3c1f1..272f411c5 100644
--- a/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationConnections/OrganizationConnectionData.cs
@@ -1,7 +1,4 @@
-
-
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationConnections
diff --git a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs
index a2236fa30..2a964ec99 100644
--- a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipData.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships
diff --git a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs
index 3b4570133..29cd20030 100644
--- a/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationSponsorships/OrganizationSponsorshipSyncData.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships
+namespace Bit.Core.Models.Data.Organizations.OrganizationSponsorships
 {
     public class OrganizationSponsorshipSyncData
     {
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs
index 892c12951..e23be4468 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserInviteData.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
index 2d06a0d2b..258b5e726 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
     public class OrganizationUserOrganizationDetails
     {
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs
index f5f5a870d..c465f49a0 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPublicKey.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
 {
     public class OrganizationUserPublicKey
     {
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs
index 5bd0eae17..ccac4a587 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserResetPasswordDetails.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
index 4e9bf5beb..334ee7417 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers
diff --git a/src/Core/Models/Data/PagedResult.cs b/src/Core/Models/Data/PagedResult.cs
index d8765ee6e..1bb7e3cd2 100644
--- a/src/Core/Models/Data/PagedResult.cs
+++ b/src/Core/Models/Data/PagedResult.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public class PagedResult<T>
     {
diff --git a/src/Core/Models/Data/Permissions.cs b/src/Core/Models/Data/Permissions.cs
index ac6011af6..501968dfd 100644
--- a/src/Core/Models/Data/Permissions.cs
+++ b/src/Core/Models/Data/Permissions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/Provider/ProviderAbility.cs b/src/Core/Models/Data/Provider/ProviderAbility.cs
index bb21cb563..a77203014 100644
--- a/src/Core/Models/Data/Provider/ProviderAbility.cs
+++ b/src/Core/Models/Data/Provider/ProviderAbility.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs b/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs
index 7c30553b3..ed0584671 100644
--- a/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs
+++ b/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs
@@ -1,7 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public class ProviderOrganizationOrganizationDetails
     {
diff --git a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs b/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs
index 62a19fabd..ee34d0081 100644
--- a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs
+++ b/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs b/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs
index 2c4dbfe5d..a14a455d9 100644
--- a/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs
+++ b/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs b/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs
index 93d3346b6..0be26770c 100644
--- a/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs
+++ b/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public class ProviderUserPublicKey
     {
diff --git a/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs b/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs
index dd082b1f7..6d0c4daa6 100644
--- a/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs
+++ b/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/SelectionReadOnly.cs b/src/Core/Models/Data/SelectionReadOnly.cs
index fb7277812..b1dd09d71 100644
--- a/src/Core/Models/Data/SelectionReadOnly.cs
+++ b/src/Core/Models/Data/SelectionReadOnly.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Data
+namespace Bit.Core.Models.Data
 {
     public class SelectionReadOnly
     {
diff --git a/src/Core/Models/Data/SendFileData.cs b/src/Core/Models/Data/SendFileData.cs
index bfda83bf1..8ec61ec79 100644
--- a/src/Core/Models/Data/SendFileData.cs
+++ b/src/Core/Models/Data/SendFileData.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/Data/SsoConfigurationData.cs b/src/Core/Models/Data/SsoConfigurationData.cs
index 149392146..093ec9a8a 100644
--- a/src/Core/Models/Data/SsoConfigurationData.cs
+++ b/src/Core/Models/Data/SsoConfigurationData.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
diff --git a/src/Core/Models/Data/UserKdfInformation.cs b/src/Core/Models/Data/UserKdfInformation.cs
index 82562c234..3825006d1 100644
--- a/src/Core/Models/Data/UserKdfInformation.cs
+++ b/src/Core/Models/Data/UserKdfInformation.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data
 {
diff --git a/src/Core/Models/ITwoFactorProvidersUser.cs b/src/Core/Models/ITwoFactorProvidersUser.cs
index e79ae0b1d..c617960ad 100644
--- a/src/Core/Models/ITwoFactorProvidersUser.cs
+++ b/src/Core/Models/ITwoFactorProvidersUser.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models
 {
diff --git a/src/Core/Models/Mail/BaseMailModel.cs b/src/Core/Models/Mail/BaseMailModel.cs
index 82c70274b..416e50d25 100644
--- a/src/Core/Models/Mail/BaseMailModel.cs
+++ b/src/Core/Models/Mail/BaseMailModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class BaseMailModel
     {
diff --git a/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipRevertingViewModel.cs b/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipRevertingViewModel.cs
index 69d94cee9..b15717c87 100644
--- a/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipRevertingViewModel.cs
+++ b/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipRevertingViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail.FamiliesForEnterprise
+namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
     public class FamiliesForEnterpriseSponsorshipRevertingViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/IMailQueueMessage.cs b/src/Core/Models/Mail/IMailQueueMessage.cs
index bd305d13e..37c09c90e 100644
--- a/src/Core/Models/Mail/IMailQueueMessage.cs
+++ b/src/Core/Models/Mail/IMailQueueMessage.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public interface IMailQueueMessage
     {
diff --git a/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs b/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
index 1a12760bf..7a3bdacea 100644
--- a/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
+++ b/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class InvoiceUpcomingViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/MailMessage.cs b/src/Core/Models/Mail/MailMessage.cs
index 4d1ae7e0e..1ccb87acf 100644
--- a/src/Core/Models/Mail/MailMessage.cs
+++ b/src/Core/Models/Mail/MailMessage.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class MailMessage
     {
diff --git a/src/Core/Models/Mail/MailQueueMessage.cs b/src/Core/Models/Mail/MailQueueMessage.cs
index 5d1a93f2b..2aa2b3c65 100644
--- a/src/Core/Models/Mail/MailQueueMessage.cs
+++ b/src/Core/Models/Mail/MailQueueMessage.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Models.Mail
diff --git a/src/Core/Models/Mail/OrganizationSeatsAutoscaledViewModel.cs b/src/Core/Models/Mail/OrganizationSeatsAutoscaledViewModel.cs
index 4c7df5bbf..44299c390 100644
--- a/src/Core/Models/Mail/OrganizationSeatsAutoscaledViewModel.cs
+++ b/src/Core/Models/Mail/OrganizationSeatsAutoscaledViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class OrganizationSeatsAutoscaledViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/OrganizationSeatsMaxReachedViewModel.cs b/src/Core/Models/Mail/OrganizationSeatsMaxReachedViewModel.cs
index 44cad6f20..5fcdee704 100644
--- a/src/Core/Models/Mail/OrganizationSeatsMaxReachedViewModel.cs
+++ b/src/Core/Models/Mail/OrganizationSeatsMaxReachedViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class OrganizationSeatsMaxReachedViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/OrganizationUserAcceptedViewModel.cs b/src/Core/Models/Mail/OrganizationUserAcceptedViewModel.cs
index c3812367a..5bfd502a5 100644
--- a/src/Core/Models/Mail/OrganizationUserAcceptedViewModel.cs
+++ b/src/Core/Models/Mail/OrganizationUserAcceptedViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class OrganizationUserAcceptedViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs b/src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs
index 36509f5bb..0e13fa663 100644
--- a/src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs
+++ b/src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class OrganizationUserInvitedViewModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/VerifyDeleteModel.cs b/src/Core/Models/Mail/VerifyDeleteModel.cs
index 8d788d2ea..dbe719981 100644
--- a/src/Core/Models/Mail/VerifyDeleteModel.cs
+++ b/src/Core/Models/Mail/VerifyDeleteModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class VerifyDeleteModel : BaseMailModel
     {
diff --git a/src/Core/Models/Mail/VerifyEmailModel.cs b/src/Core/Models/Mail/VerifyEmailModel.cs
index 2f150ae61..934ac590f 100644
--- a/src/Core/Models/Mail/VerifyEmailModel.cs
+++ b/src/Core/Models/Mail/VerifyEmailModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.Mail
+namespace Bit.Core.Models.Mail
 {
     public class VerifyEmailModel : BaseMailModel
     {
diff --git a/src/Core/Models/OrganizationConnectionConfigs/BillingSyncConfig.cs b/src/Core/Models/OrganizationConnectionConfigs/BillingSyncConfig.cs
index 761bbb8db..8b46eb831 100644
--- a/src/Core/Models/OrganizationConnectionConfigs/BillingSyncConfig.cs
+++ b/src/Core/Models/OrganizationConnectionConfigs/BillingSyncConfig.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Models.OrganizationConnectionConfigs
+namespace Bit.Core.Models.OrganizationConnectionConfigs
 {
     public class BillingSyncConfig
     {
diff --git a/src/Core/Models/PushNotification.cs b/src/Core/Models/PushNotification.cs
index cf11f5a37..7f34b2562 100644
--- a/src/Core/Models/PushNotification.cs
+++ b/src/Core/Models/PushNotification.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models
 {
diff --git a/src/Core/Models/StaticStore/SponsoredPlan.cs b/src/Core/Models/StaticStore/SponsoredPlan.cs
index 92a7bfd15..e1a8dbd96 100644
--- a/src/Core/Models/StaticStore/SponsoredPlan.cs
+++ b/src/Core/Models/StaticStore/SponsoredPlan.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Core.Models.StaticStore
diff --git a/src/Core/Models/TwoFactorProvider.cs b/src/Core/Models/TwoFactorProvider.cs
index dc1ed35b0..7e48ed397 100644
--- a/src/Core/Models/TwoFactorProvider.cs
+++ b/src/Core/Models/TwoFactorProvider.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Enums;
 using Fido2NetLib.Objects;
 
diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommand.cs
index a45aeb429..93b4d15bd 100644
--- a/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyCommand.cs
index 9ba0eab3d..645fb1086 100644
--- a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces
diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs
index 1667b05c9..85d047987 100644
--- a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs
index de1ae62e6..967f39947 100644
--- a/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs
index 655df2007..c54ef5dfc 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs
index 86196987d..784975780 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
 
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs
index 42f81049b..c91985d75 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs
index 47d85bed4..1b92a9fcf 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs
index 0f94c1e7a..d01fd0b9a 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces
diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs b/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs
index 9a13cd55c..74aa08bd3 100644
--- a/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs
index 4900fd088..71ce0b4fa 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommand.cs
index 73ad3876f..d12765eff 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs
index 252ed2803..c4da82c96 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommand.cs
index 0e9dc94ad..148b525d7 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
+using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommand.cs
index 3cf01ad73..136c1681b 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommand.cs
index 6607bf578..b77706051 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommand.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business.Tokenables;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs
index 4391db605..698ec549d 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommand.cs
index 9c0a9e37c..f1032f0b2 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommand.cs
index 91d990e36..179f5b3ac 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
index f4cb6b4df..3b0bf3f14 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs
index 01bb68584..6d186726a 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Context;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ICreateSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ICreateSponsorshipCommand.cs
index 135e8b6c3..c321524e7 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ICreateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ICreateSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IOrganizationSponsorshipRenewCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IOrganizationSponsorshipRenewCommand.cs
index b91a3698e..762d166bd 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IOrganizationSponsorshipRenewCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IOrganizationSponsorshipRenewCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
+namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
     public interface IOrganizationSponsorshipRenewCommand
     {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRemoveSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRemoveSponsorshipCommand.cs
index 3e75d2756..21a8fec89 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRemoveSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRemoveSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRevokeSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRevokeSponsorshipCommand.cs
index dc97edb32..18ca25d17 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRevokeSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IRevokeSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISendSponsorshipOfferCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISendSponsorshipOfferCommand.cs
index 4a3f5ce30..a047c4d66 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISendSponsorshipOfferCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISendSponsorshipOfferCommand.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISetUpSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISetUpSponsorshipCommand.cs
index 93d55e330..d4c5e9b0e 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISetUpSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISetUpSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISyncOrganizationSponsorshipsCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISyncOrganizationSponsorshipsCommand.cs
index 77033c546..9533e4bfd 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISyncOrganizationSponsorshipsCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/ISyncOrganizationSponsorshipsCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateBillingSyncKeyCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateBillingSyncKeyCommand.cs
index f411dc1c2..1ac3e1c0d 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateBillingSyncKeyCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateBillingSyncKeyCommand.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateRedemptionTokenCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateRedemptionTokenCommand.cs
index b8b369efc..a7db2ed2e 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateRedemptionTokenCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateRedemptionTokenCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateSponsorshipCommand.cs
index fd63e679e..0d0124677 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Interfaces/IValidateSponsorshipCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
+namespace Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces
 {
     public interface IValidateSponsorshipCommand
     {
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommand.cs
index 56703bdc4..aad92f43c 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommand.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
diff --git a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommand.cs b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommand.cs
index 848d52012..4f12c1cf3 100644
--- a/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommand.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Request.OrganizationSponsorships;
 using Bit.Core.Models.Api.Response.OrganizationSponsorships;
diff --git a/src/Core/Repositories/ICipherRepository.cs b/src/Core/Repositories/ICipherRepository.cs
index 6b03730bb..5e071a55f 100644
--- a/src/Core/Repositories/ICipherRepository.cs
+++ b/src/Core/Repositories/ICipherRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Core.Models.Data;
 
diff --git a/src/Core/Repositories/ICollectionCipherRepository.cs b/src/Core/Repositories/ICollectionCipherRepository.cs
index e9e686a97..b79c65737 100644
--- a/src/Core/Repositories/ICollectionCipherRepository.cs
+++ b/src/Core/Repositories/ICollectionCipherRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ICollectionRepository.cs b/src/Core/Repositories/ICollectionRepository.cs
index 0a0eaf973..e53379997 100644
--- a/src/Core/Repositories/ICollectionRepository.cs
+++ b/src/Core/Repositories/ICollectionRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IDeviceRepository.cs b/src/Core/Repositories/IDeviceRepository.cs
index 94ded9f40..85221d446 100644
--- a/src/Core/Repositories/IDeviceRepository.cs
+++ b/src/Core/Repositories/IDeviceRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IEmergencyAccessRepository.cs b/src/Core/Repositories/IEmergencyAccessRepository.cs
index 364e5cddd..449bfe631 100644
--- a/src/Core/Repositories/IEmergencyAccessRepository.cs
+++ b/src/Core/Repositories/IEmergencyAccessRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IEventRepository.cs b/src/Core/Repositories/IEventRepository.cs
index 341355ee6..c2af5c0e0 100644
--- a/src/Core/Repositories/IEventRepository.cs
+++ b/src/Core/Repositories/IEventRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IFolderRepository.cs b/src/Core/Repositories/IFolderRepository.cs
index ef39ab415..c174f4fb1 100644
--- a/src/Core/Repositories/IFolderRepository.cs
+++ b/src/Core/Repositories/IFolderRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IGrantRepository.cs b/src/Core/Repositories/IGrantRepository.cs
index a182020cf..edab4c815 100644
--- a/src/Core/Repositories/IGrantRepository.cs
+++ b/src/Core/Repositories/IGrantRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IGroupRepository.cs b/src/Core/Repositories/IGroupRepository.cs
index b03f8960e..e8cdc43bc 100644
--- a/src/Core/Repositories/IGroupRepository.cs
+++ b/src/Core/Repositories/IGroupRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IInstallationDeviceRepository.cs b/src/Core/Repositories/IInstallationDeviceRepository.cs
index de94982ea..394b80837 100644
--- a/src/Core/Repositories/IInstallationDeviceRepository.cs
+++ b/src/Core/Repositories/IInstallationDeviceRepository.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IInstallationRepository.cs b/src/Core/Repositories/IInstallationRepository.cs
index 2ff2f01cc..f88e81e5f 100644
--- a/src/Core/Repositories/IInstallationRepository.cs
+++ b/src/Core/Repositories/IInstallationRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IMaintenanceRepository.cs b/src/Core/Repositories/IMaintenanceRepository.cs
index eb53ff7d7..c1dc098c6 100644
--- a/src/Core/Repositories/IMaintenanceRepository.cs
+++ b/src/Core/Repositories/IMaintenanceRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Repositories
+namespace Bit.Core.Repositories
 {
     public interface IMaintenanceRepository
     {
diff --git a/src/Core/Repositories/IMetaDataRepository.cs b/src/Core/Repositories/IMetaDataRepository.cs
index f441de7ca..69895b9c8 100644
--- a/src/Core/Repositories/IMetaDataRepository.cs
+++ b/src/Core/Repositories/IMetaDataRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Repositories
+namespace Bit.Core.Repositories
 {
     public interface IMetaDataRepository
     {
diff --git a/src/Core/Repositories/IOrganizationApiKeyRepository.cs b/src/Core/Repositories/IOrganizationApiKeyRepository.cs
index 23727014d..8b1b24978 100644
--- a/src/Core/Repositories/IOrganizationApiKeyRepository.cs
+++ b/src/Core/Repositories/IOrganizationApiKeyRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IOrganizationConnectionRepository.cs b/src/Core/Repositories/IOrganizationConnectionRepository.cs
index 86fc2868c..b87a82d14 100644
--- a/src/Core/Repositories/IOrganizationConnectionRepository.cs
+++ b/src/Core/Repositories/IOrganizationConnectionRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IOrganizationRepository.cs b/src/Core/Repositories/IOrganizationRepository.cs
index 298b32d5b..392a925c3 100644
--- a/src/Core/Repositories/IOrganizationRepository.cs
+++ b/src/Core/Repositories/IOrganizationRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IOrganizationSponsorshipRepository.cs b/src/Core/Repositories/IOrganizationSponsorshipRepository.cs
index 3d9c4f0ec..2ef24580c 100644
--- a/src/Core/Repositories/IOrganizationSponsorshipRepository.cs
+++ b/src/Core/Repositories/IOrganizationSponsorshipRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IOrganizationUserRepository.cs b/src/Core/Repositories/IOrganizationUserRepository.cs
index 3412c331d..6b3438e74 100644
--- a/src/Core/Repositories/IOrganizationUserRepository.cs
+++ b/src/Core/Repositories/IOrganizationUserRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Core/Repositories/IPolicyRepository.cs b/src/Core/Repositories/IPolicyRepository.cs
index 97c8f1ba1..34206770e 100644
--- a/src/Core/Repositories/IPolicyRepository.cs
+++ b/src/Core/Repositories/IPolicyRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations.Policies;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/IProviderOrganizationRepository.cs b/src/Core/Repositories/IProviderOrganizationRepository.cs
index e42eb098b..7c2cfb3b1 100644
--- a/src/Core/Repositories/IProviderOrganizationRepository.cs
+++ b/src/Core/Repositories/IProviderOrganizationRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IProviderRepository.cs b/src/Core/Repositories/IProviderRepository.cs
index df226aec0..5b3700d81 100644
--- a/src/Core/Repositories/IProviderRepository.cs
+++ b/src/Core/Repositories/IProviderRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IProviderUserRepository.cs b/src/Core/Repositories/IProviderUserRepository.cs
index 7a32188c7..14882a0a5 100644
--- a/src/Core/Repositories/IProviderUserRepository.cs
+++ b/src/Core/Repositories/IProviderUserRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 
diff --git a/src/Core/Repositories/IRepository.cs b/src/Core/Repositories/IRepository.cs
index 5bf38159f..3316bef51 100644
--- a/src/Core/Repositories/IRepository.cs
+++ b/src/Core/Repositories/IRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ISendRepository.cs b/src/Core/Repositories/ISendRepository.cs
index ea12a9e96..4a4fe5ebf 100644
--- a/src/Core/Repositories/ISendRepository.cs
+++ b/src/Core/Repositories/ISendRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ISsoConfigRepository.cs b/src/Core/Repositories/ISsoConfigRepository.cs
index 4d3c5090d..2350e0a4a 100644
--- a/src/Core/Repositories/ISsoConfigRepository.cs
+++ b/src/Core/Repositories/ISsoConfigRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ISsoUserRepository.cs b/src/Core/Repositories/ISsoUserRepository.cs
index a5e5dd305..6dcada929 100644
--- a/src/Core/Repositories/ISsoUserRepository.cs
+++ b/src/Core/Repositories/ISsoUserRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ITaxRateRepository.cs b/src/Core/Repositories/ITaxRateRepository.cs
index 51e86f340..779c2c714 100644
--- a/src/Core/Repositories/ITaxRateRepository.cs
+++ b/src/Core/Repositories/ITaxRateRepository.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Repositories
 {
diff --git a/src/Core/Repositories/ITransactionRepository.cs b/src/Core/Repositories/ITransactionRepository.cs
index 8bd0f952e..6fb9b27b7 100644
--- a/src/Core/Repositories/ITransactionRepository.cs
+++ b/src/Core/Repositories/ITransactionRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/IUserRepository.cs b/src/Core/Repositories/IUserRepository.cs
index 0c047f857..8ed89f7e0 100644
--- a/src/Core/Repositories/IUserRepository.cs
+++ b/src/Core/Repositories/IUserRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
diff --git a/src/Core/Repositories/Noop/InstallationDeviceRepository.cs b/src/Core/Repositories/Noop/InstallationDeviceRepository.cs
index 1618fcdd3..eb446547a 100644
--- a/src/Core/Repositories/Noop/InstallationDeviceRepository.cs
+++ b/src/Core/Repositories/Noop/InstallationDeviceRepository.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories.Noop
 {
diff --git a/src/Core/Repositories/Noop/MetaDataRepository.cs b/src/Core/Repositories/Noop/MetaDataRepository.cs
index 137eee92e..1f4658455 100644
--- a/src/Core/Repositories/Noop/MetaDataRepository.cs
+++ b/src/Core/Repositories/Noop/MetaDataRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Repositories.Noop
+namespace Bit.Core.Repositories.Noop
 {
     public class MetaDataRepository : IMetaDataRepository
     {
diff --git a/src/Core/Repositories/TableStorage/EventRepository.cs b/src/Core/Repositories/TableStorage/EventRepository.cs
index c2cd4b4a0..9ee541b8a 100644
--- a/src/Core/Repositories/TableStorage/EventRepository.cs
+++ b/src/Core/Repositories/TableStorage/EventRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
diff --git a/src/Core/Repositories/TableStorage/InstallationDeviceRepository.cs b/src/Core/Repositories/TableStorage/InstallationDeviceRepository.cs
index 828b3366e..125360e6b 100644
--- a/src/Core/Repositories/TableStorage/InstallationDeviceRepository.cs
+++ b/src/Core/Repositories/TableStorage/InstallationDeviceRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 using Microsoft.Azure.Cosmos.Table;
diff --git a/src/Core/Repositories/TableStorage/MetaDataRepository.cs b/src/Core/Repositories/TableStorage/MetaDataRepository.cs
index 86721128b..83ae04e4b 100644
--- a/src/Core/Repositories/TableStorage/MetaDataRepository.cs
+++ b/src/Core/Repositories/TableStorage/MetaDataRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 using Microsoft.Azure.Cosmos.Table;
diff --git a/src/Core/Resources/SharedResources.cs b/src/Core/Resources/SharedResources.cs
index 64801700d..543ec227a 100644
--- a/src/Core/Resources/SharedResources.cs
+++ b/src/Core/Resources/SharedResources.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Resources
+namespace Bit.Core.Resources
 {
     public class SharedResources
     {
diff --git a/src/Core/Services/IAppleIapService.cs b/src/Core/Services/IAppleIapService.cs
index ecbd58ca0..aef7e2c88 100644
--- a/src/Core/Services/IAppleIapService.cs
+++ b/src/Core/Services/IAppleIapService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Billing.Models;
+using Bit.Billing.Models;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IApplicationCacheService.cs b/src/Core/Services/IApplicationCacheService.cs
index 2dc8b64ec..08efe7b7c 100644
--- a/src/Core/Services/IApplicationCacheService.cs
+++ b/src/Core/Services/IApplicationCacheService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations;
diff --git a/src/Core/Services/IAttachmentStorageService.cs b/src/Core/Services/IAttachmentStorageService.cs
index 31b74f2f1..c0b11a021 100644
--- a/src/Core/Services/IAttachmentStorageService.cs
+++ b/src/Core/Services/IAttachmentStorageService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
diff --git a/src/Core/Services/IBlockIpService.cs b/src/Core/Services/IBlockIpService.cs
index c1acc3425..547a7cede 100644
--- a/src/Core/Services/IBlockIpService.cs
+++ b/src/Core/Services/IBlockIpService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Services
+namespace Bit.Core.Services
 {
     public interface IBlockIpService
     {
diff --git a/src/Core/Services/ICaptchaValidationService.cs b/src/Core/Services/ICaptchaValidationService.cs
index 3816fbf0b..d908be7c2 100644
--- a/src/Core/Services/ICaptchaValidationService.cs
+++ b/src/Core/Services/ICaptchaValidationService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 
diff --git a/src/Core/Services/ICipherService.cs b/src/Core/Services/ICipherService.cs
index 3684aab6b..e8a3e78f1 100644
--- a/src/Core/Services/ICipherService.cs
+++ b/src/Core/Services/ICipherService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Core.Models.Data;
 
diff --git a/src/Core/Services/ICollectionService.cs b/src/Core/Services/ICollectionService.cs
index 9bcc4b859..7c2e286f5 100644
--- a/src/Core/Services/ICollectionService.cs
+++ b/src/Core/Services/ICollectionService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/IDeviceService.cs b/src/Core/Services/IDeviceService.cs
index 0fbd2f045..6455e6a32 100644
--- a/src/Core/Services/IDeviceService.cs
+++ b/src/Core/Services/IDeviceService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IEmergencyAccessService.cs b/src/Core/Services/IEmergencyAccessService.cs
index fc9ee0e09..f975bfe76 100644
--- a/src/Core/Services/IEmergencyAccessService.cs
+++ b/src/Core/Services/IEmergencyAccessService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
diff --git a/src/Core/Services/IEventService.cs b/src/Core/Services/IEventService.cs
index 444df18c7..fa9848584 100644
--- a/src/Core/Services/IEventService.cs
+++ b/src/Core/Services/IEventService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 
diff --git a/src/Core/Services/IEventWriteService.cs b/src/Core/Services/IEventWriteService.cs
index 975bb3f8c..dc3318937 100644
--- a/src/Core/Services/IEventWriteService.cs
+++ b/src/Core/Services/IEventWriteService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IGroupService.cs b/src/Core/Services/IGroupService.cs
index 6fc6cea70..82fd9792a 100644
--- a/src/Core/Services/IGroupService.cs
+++ b/src/Core/Services/IGroupService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/ILicensingService.cs b/src/Core/Services/ILicensingService.cs
index a3c3055d4..fd3ad9afe 100644
--- a/src/Core/Services/ILicensingService.cs
+++ b/src/Core/Services/ILicensingService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/IMailDeliveryService.cs b/src/Core/Services/IMailDeliveryService.cs
index bcac8189c..1c42e39e2 100644
--- a/src/Core/Services/IMailDeliveryService.cs
+++ b/src/Core/Services/IMailDeliveryService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IMailEnqueuingService.cs b/src/Core/Services/IMailEnqueuingService.cs
index 00229b015..1e681b6ca 100644
--- a/src/Core/Services/IMailEnqueuingService.cs
+++ b/src/Core/Services/IMailEnqueuingService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs
index 87e2a7403..7be31e82a 100644
--- a/src/Core/Services/IMailService.cs
+++ b/src/Core/Services/IMailService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Mail;
diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs
index 6624c8830..a2a12a66d 100644
--- a/src/Core/Services/IOrganizationService.cs
+++ b/src/Core/Services/IOrganizationService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
diff --git a/src/Core/Services/IPaymentService.cs b/src/Core/Services/IPaymentService.cs
index f3287d9e0..562c70e3a 100644
--- a/src/Core/Services/IPaymentService.cs
+++ b/src/Core/Services/IPaymentService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.StaticStore;
diff --git a/src/Core/Services/IPolicyService.cs b/src/Core/Services/IPolicyService.cs
index 838a1beb7..d7487cbd4 100644
--- a/src/Core/Services/IPolicyService.cs
+++ b/src/Core/Services/IPolicyService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IProviderService.cs b/src/Core/Services/IProviderService.cs
index c0078c2b0..eb38afad2 100644
--- a/src/Core/Services/IProviderService.cs
+++ b/src/Core/Services/IProviderService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Business.Provider;
diff --git a/src/Core/Services/IPushNotificationService.cs b/src/Core/Services/IPushNotificationService.cs
index c64e696ee..9707b93dc 100644
--- a/src/Core/Services/IPushNotificationService.cs
+++ b/src/Core/Services/IPushNotificationService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/IPushRegistrationService.cs b/src/Core/Services/IPushRegistrationService.cs
index 20d79b1c5..14d2c82ef 100644
--- a/src/Core/Services/IPushRegistrationService.cs
+++ b/src/Core/Services/IPushRegistrationService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IReferenceEventService.cs b/src/Core/Services/IReferenceEventService.cs
index c17fca4e6..fa85a2a3d 100644
--- a/src/Core/Services/IReferenceEventService.cs
+++ b/src/Core/Services/IReferenceEventService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Models.Business;
+using Bit.Core.Models.Business;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/ISendService.cs b/src/Core/Services/ISendService.cs
index 5c15ae05b..8ee97a629 100644
--- a/src/Core/Services/ISendService.cs
+++ b/src/Core/Services/ISendService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/ISendStorageService.cs b/src/Core/Services/ISendStorageService.cs
index cd1ade094..f671d0077 100644
--- a/src/Core/Services/ISendStorageService.cs
+++ b/src/Core/Services/ISendStorageService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/ISsoConfigService.cs b/src/Core/Services/ISsoConfigService.cs
index d9a7eb20e..d4d2cfcef 100644
--- a/src/Core/Services/ISsoConfigService.cs
+++ b/src/Core/Services/ISsoConfigService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/IStripeAdapter.cs b/src/Core/Services/IStripeAdapter.cs
index fdc4b797e..82915a207 100644
--- a/src/Core/Services/IStripeAdapter.cs
+++ b/src/Core/Services/IStripeAdapter.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Services
+namespace Bit.Core.Services
 {
     public interface IStripeAdapter
     {
diff --git a/src/Core/Services/IStripeSyncService.cs b/src/Core/Services/IStripeSyncService.cs
index 4f194075e..0219bc5d2 100644
--- a/src/Core/Services/IStripeSyncService.cs
+++ b/src/Core/Services/IStripeSyncService.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Bit.Core.Services
+namespace Bit.Core.Services
 {
     public interface IStripeSyncService
     {
diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs
index 716a981d0..76a60f97d 100644
--- a/src/Core/Services/IUserService.cs
+++ b/src/Core/Services/IUserService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs b/src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs
index 371ee5cc5..98275b4ab 100644
--- a/src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs
+++ b/src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Amazon;
+using Amazon;
 using Amazon.SimpleEmail;
 using Amazon.SimpleEmail.Model;
 using Bit.Core.Models.Mail;
diff --git a/src/Core/Services/Implementations/AmazonSqsBlockIpService.cs b/src/Core/Services/Implementations/AmazonSqsBlockIpService.cs
index cf0202334..1e6dcf935 100644
--- a/src/Core/Services/Implementations/AmazonSqsBlockIpService.cs
+++ b/src/Core/Services/Implementations/AmazonSqsBlockIpService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Amazon;
+using Amazon;
 using Amazon.SQS;
 using Bit.Core.Settings;
 
diff --git a/src/Core/Services/Implementations/AppleIapService.cs b/src/Core/Services/Implementations/AppleIapService.cs
index 2b20b040a..2fa8edfd7 100644
--- a/src/Core/Services/Implementations/AppleIapService.cs
+++ b/src/Core/Services/Implementations/AppleIapService.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
+using System.Net.Http.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using Bit.Billing.Models;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/AzureAttachmentStorageService.cs b/src/Core/Services/Implementations/AzureAttachmentStorageService.cs
index 560dc3a55..6a9e8f77f 100644
--- a/src/Core/Services/Implementations/AzureAttachmentStorageService.cs
+++ b/src/Core/Services/Implementations/AzureAttachmentStorageService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Azure.Storage.Blobs;
+using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
 using Bit.Core.Entities;
diff --git a/src/Core/Services/Implementations/AzureQueueBlockIpService.cs b/src/Core/Services/Implementations/AzureQueueBlockIpService.cs
index 02d60aa69..8682b0c49 100644
--- a/src/Core/Services/Implementations/AzureQueueBlockIpService.cs
+++ b/src/Core/Services/Implementations/AzureQueueBlockIpService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Azure.Storage.Queues;
+using Azure.Storage.Queues;
 using Bit.Core.Settings;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/Implementations/AzureQueueEventWriteService.cs b/src/Core/Services/Implementations/AzureQueueEventWriteService.cs
index 88fc7edad..bf74677f1 100644
--- a/src/Core/Services/Implementations/AzureQueueEventWriteService.cs
+++ b/src/Core/Services/Implementations/AzureQueueEventWriteService.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Azure.Storage.Queues;
+using Azure.Storage.Queues;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
diff --git a/src/Core/Services/Implementations/AzureQueueMailService.cs b/src/Core/Services/Implementations/AzureQueueMailService.cs
index f87ca1467..e05c106ea 100644
--- a/src/Core/Services/Implementations/AzureQueueMailService.cs
+++ b/src/Core/Services/Implementations/AzureQueueMailService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Azure.Storage.Queues;
+using Azure.Storage.Queues;
 using Bit.Core.Models.Mail;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
diff --git a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
index 1d837d1f5..7062c6c18 100644
--- a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
+++ b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Storage.Queues;
 using Bit.Core.Context;
 using Bit.Core.Entities;
diff --git a/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs b/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs
index b9d3177bf..e3b0f0ecf 100644
--- a/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs
+++ b/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Text;
+using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Azure.Storage.Queues;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/AzureQueueService.cs b/src/Core/Services/Implementations/AzureQueueService.cs
index 98be59777..942be2680 100644
--- a/src/Core/Services/Implementations/AzureQueueService.cs
+++ b/src/Core/Services/Implementations/AzureQueueService.cs
@@ -1,8 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Azure.Storage.Queues;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Services/Implementations/AzureSendFileStorageService.cs b/src/Core/Services/Implementations/AzureSendFileStorageService.cs
index 7c362568a..94a0aaaee 100644
--- a/src/Core/Services/Implementations/AzureSendFileStorageService.cs
+++ b/src/Core/Services/Implementations/AzureSendFileStorageService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Azure.Storage.Blobs;
+using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
 using Bit.Core.Entities;
diff --git a/src/Core/Services/Implementations/BaseIdentityClientService.cs b/src/Core/Services/Implementations/BaseIdentityClientService.cs
index a341b2820..2115eba24 100644
--- a/src/Core/Services/Implementations/BaseIdentityClientService.cs
+++ b/src/Core/Services/Implementations/BaseIdentityClientService.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
+using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/Core/Services/Implementations/BlockingMailQueueService.cs b/src/Core/Services/Implementations/BlockingMailQueueService.cs
index f8bc24c15..0a1a99b85 100644
--- a/src/Core/Services/Implementations/BlockingMailQueueService.cs
+++ b/src/Core/Services/Implementations/BlockingMailQueueService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/Implementations/CipherService.cs b/src/Core/Services/Implementations/CipherService.cs
index 663c3a910..1376b09e7 100644
--- a/src/Core/Services/Implementations/CipherService.cs
+++ b/src/Core/Services/Implementations/CipherService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
diff --git a/src/Core/Services/Implementations/CollectionService.cs b/src/Core/Services/Implementations/CollectionService.cs
index af6fd3385..192785e33 100644
--- a/src/Core/Services/Implementations/CollectionService.cs
+++ b/src/Core/Services/Implementations/CollectionService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
diff --git a/src/Core/Services/Implementations/DeviceService.cs b/src/Core/Services/Implementations/DeviceService.cs
index 951abfac3..a65a49bdd 100644
--- a/src/Core/Services/Implementations/DeviceService.cs
+++ b/src/Core/Services/Implementations/DeviceService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/Implementations/EmergencyAccessService.cs b/src/Core/Services/Implementations/EmergencyAccessService.cs
index 07fa5fe68..06a5e5a85 100644
--- a/src/Core/Services/Implementations/EmergencyAccessService.cs
+++ b/src/Core/Services/Implementations/EmergencyAccessService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models;
diff --git a/src/Core/Services/Implementations/EventService.cs b/src/Core/Services/Implementations/EventService.cs
index bd7f979ea..39b2fdfd5 100644
--- a/src/Core/Services/Implementations/EventService.cs
+++ b/src/Core/Services/Implementations/EventService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/GroupService.cs b/src/Core/Services/Implementations/GroupService.cs
index c7b5bcb61..3d7872f70 100644
--- a/src/Core/Services/Implementations/GroupService.cs
+++ b/src/Core/Services/Implementations/GroupService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
diff --git a/src/Core/Services/Implementations/HCaptchaValidationService.cs b/src/Core/Services/Implementations/HCaptchaValidationService.cs
index e88045db5..0b72d5286 100644
--- a/src/Core/Services/Implementations/HCaptchaValidationService.cs
+++ b/src/Core/Services/Implementations/HCaptchaValidationService.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Json;
+using System.Net.Http.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs
index ed829cb55..c48a032b5 100644
--- a/src/Core/Services/Implementations/HandlebarsMailService.cs
+++ b/src/Core/Services/Implementations/HandlebarsMailService.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
+using System.Net;
 using System.Reflection;
-using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
diff --git a/src/Core/Services/Implementations/I18nService.cs b/src/Core/Services/Implementations/I18nService.cs
index fc383f203..e9675ca58 100644
--- a/src/Core/Services/Implementations/I18nService.cs
+++ b/src/Core/Services/Implementations/I18nService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using Bit.Core.Resources;
 using Microsoft.Extensions.Localization;
 
diff --git a/src/Core/Services/Implementations/I18nViewLocalizer.cs b/src/Core/Services/Implementations/I18nViewLocalizer.cs
index 716427501..4a8d86678 100644
--- a/src/Core/Services/Implementations/I18nViewLocalizer.cs
+++ b/src/Core/Services/Implementations/I18nViewLocalizer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
+using System.Reflection;
 using Bit.Core.Resources;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
diff --git a/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs b/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs
index b7c50288a..98333ff55 100644
--- a/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs
+++ b/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations;
diff --git a/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs b/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs
index fd0d9b339..c12efb409 100644
--- a/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs
+++ b/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs
index f085b042a..70625e758 100644
--- a/src/Core/Services/Implementations/LicensingService.cs
+++ b/src/Core/Services/Implementations/LicensingService.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 using Bit.Core.Repositories;
diff --git a/src/Core/Services/Implementations/LocalAttachmentStorageService.cs b/src/Core/Services/Implementations/LocalAttachmentStorageService.cs
index 72f55280b..d24a561e3 100644
--- a/src/Core/Services/Implementations/LocalAttachmentStorageService.cs
+++ b/src/Core/Services/Implementations/LocalAttachmentStorageService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/LocalSendStorageService.cs b/src/Core/Services/Implementations/LocalSendStorageService.cs
index 5ab7fca35..200309f5b 100644
--- a/src/Core/Services/Implementations/LocalSendStorageService.cs
+++ b/src/Core/Services/Implementations/LocalSendStorageService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Settings;
 
diff --git a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs
index 6ded88b0b..b4b93278e 100644
--- a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs
+++ b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using MailKit.Net.Smtp;
 using Microsoft.Extensions.Logging;
diff --git a/src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs b/src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs
index f714b42f8..286415fc2 100644
--- a/src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs
+++ b/src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
diff --git a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
index 3288b5237..f940bad00 100644
--- a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
+++ b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
index 909941515..dbf4e55aa 100644
--- a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
index 89ea54d7a..be3f8735f 100644
--- a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
index 0e2a07166..87729be70 100644
--- a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
+++ b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 50f2a5f40..54cd1a0b1 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/PolicyService.cs b/src/Core/Services/Implementations/PolicyService.cs
index 2ca38300f..e84a124e6 100644
--- a/src/Core/Services/Implementations/PolicyService.cs
+++ b/src/Core/Services/Implementations/PolicyService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
diff --git a/src/Core/Services/Implementations/RelayPushNotificationService.cs b/src/Core/Services/Implementations/RelayPushNotificationService.cs
index f3cddee65..b66cb7ca1 100644
--- a/src/Core/Services/Implementations/RelayPushNotificationService.cs
+++ b/src/Core/Services/Implementations/RelayPushNotificationService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/src/Core/Services/Implementations/RelayPushRegistrationService.cs b/src/Core/Services/Implementations/RelayPushRegistrationService.cs
index 837df3a60..82ae88799 100644
--- a/src/Core/Services/Implementations/RelayPushRegistrationService.cs
+++ b/src/Core/Services/Implementations/RelayPushRegistrationService.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
diff --git a/src/Core/Services/Implementations/RepositoryEventWriteService.cs b/src/Core/Services/Implementations/RepositoryEventWriteService.cs
index 294f7ee91..11d028340 100644
--- a/src/Core/Services/Implementations/RepositoryEventWriteService.cs
+++ b/src/Core/Services/Implementations/RepositoryEventWriteService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/Implementations/SendGridMailDeliveryService.cs b/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
index 3214f7dcd..0e34b170d 100644
--- a/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
+++ b/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Hosting;
diff --git a/src/Core/Services/Implementations/SendService.cs b/src/Core/Services/Implementations/SendService.cs
index 61722f307..6c41c6d9c 100644
--- a/src/Core/Services/Implementations/SendService.cs
+++ b/src/Core/Services/Implementations/SendService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/SsoConfigService.cs b/src/Core/Services/Implementations/SsoConfigService.cs
index 51425c4e9..4af794967 100644
--- a/src/Core/Services/Implementations/SsoConfigService.cs
+++ b/src/Core/Services/Implementations/SsoConfigService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
diff --git a/src/Core/Services/Implementations/StripeAdapter.cs b/src/Core/Services/Implementations/StripeAdapter.cs
index 7b46640e7..019ba99c8 100644
--- a/src/Core/Services/Implementations/StripeAdapter.cs
+++ b/src/Core/Services/Implementations/StripeAdapter.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Bit.Core.Services
+namespace Bit.Core.Services
 {
     public class StripeAdapter : IStripeAdapter
     {
diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs
index c79620ebd..ba0fb60d9 100644
--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Billing.Models;
+using Bit.Billing.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
diff --git a/src/Core/Services/Implementations/StripeSyncService.cs b/src/Core/Services/Implementations/StripeSyncService.cs
index 10e3048f1..f042eac5c 100644
--- a/src/Core/Services/Implementations/StripeSyncService.cs
+++ b/src/Core/Services/Implementations/StripeSyncService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Exceptions;
+using Bit.Core.Exceptions;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs
index 73077665e..6250f19ca 100644
--- a/src/Core/Services/Implementations/UserService.cs
+++ b/src/Core/Services/Implementations/UserService.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/NoopImplementations/NoopAttachmentStorageService.cs b/src/Core/Services/NoopImplementations/NoopAttachmentStorageService.cs
index f0dba5744..7643fc43c 100644
--- a/src/Core/Services/NoopImplementations/NoopAttachmentStorageService.cs
+++ b/src/Core/Services/NoopImplementations/NoopAttachmentStorageService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
diff --git a/src/Core/Services/NoopImplementations/NoopBlockIpService.cs b/src/Core/Services/NoopImplementations/NoopBlockIpService.cs
index 2b2a8b5c9..4ec59f09d 100644
--- a/src/Core/Services/NoopImplementations/NoopBlockIpService.cs
+++ b/src/Core/Services/NoopImplementations/NoopBlockIpService.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Bit.Core.Services
+namespace Bit.Core.Services
 {
     public class NoopBlockIpService : IBlockIpService
     {
diff --git a/src/Core/Services/NoopImplementations/NoopCaptchaValidationService.cs b/src/Core/Services/NoopImplementations/NoopCaptchaValidationService.cs
index de68cc490..6e680227a 100644
--- a/src/Core/Services/NoopImplementations/NoopCaptchaValidationService.cs
+++ b/src/Core/Services/NoopImplementations/NoopCaptchaValidationService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 
diff --git a/src/Core/Services/NoopImplementations/NoopEventService.cs b/src/Core/Services/NoopImplementations/NoopEventService.cs
index c42334785..976657bf3 100644
--- a/src/Core/Services/NoopImplementations/NoopEventService.cs
+++ b/src/Core/Services/NoopImplementations/NoopEventService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 
diff --git a/src/Core/Services/NoopImplementations/NoopEventWriteService.cs b/src/Core/Services/NoopImplementations/NoopEventWriteService.cs
index 00f2f027b..94be40b20 100644
--- a/src/Core/Services/NoopImplementations/NoopEventWriteService.cs
+++ b/src/Core/Services/NoopImplementations/NoopEventWriteService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/NoopImplementations/NoopLicensingService.cs b/src/Core/Services/NoopImplementations/NoopLicensingService.cs
index 8524b1aec..ef5cb9b85 100644
--- a/src/Core/Services/NoopImplementations/NoopLicensingService.cs
+++ b/src/Core/Services/NoopImplementations/NoopLicensingService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
diff --git a/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs b/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs
index 68d82be6d..dc8ef6b60 100644
--- a/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs
+++ b/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs
index ba8d79069..910516ab5 100644
--- a/src/Core/Services/NoopImplementations/NoopMailService.cs
+++ b/src/Core/Services/NoopImplementations/NoopMailService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Mail;
diff --git a/src/Core/Services/NoopImplementations/NoopProviderService.cs b/src/Core/Services/NoopImplementations/NoopProviderService.cs
index d52f0b640..efa574144 100644
--- a/src/Core/Services/NoopImplementations/NoopProviderService.cs
+++ b/src/Core/Services/NoopImplementations/NoopProviderService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Business.Provider;
diff --git a/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs
index d21a3dd62..8d9f1117e 100644
--- a/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs
+++ b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Services/NoopImplementations/NoopPushRegistrationService.cs b/src/Core/Services/NoopImplementations/NoopPushRegistrationService.cs
index 506835e8a..c574314e0 100644
--- a/src/Core/Services/NoopImplementations/NoopPushRegistrationService.cs
+++ b/src/Core/Services/NoopImplementations/NoopPushRegistrationService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs b/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs
index ccc8146f5..fa15ce727 100644
--- a/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs
+++ b/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Models.Business;
+using Bit.Core.Models.Business;
 
 namespace Bit.Core.Services
 {
diff --git a/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs b/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs
index acbae1fb5..407e3976f 100644
--- a/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs
+++ b/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 
 namespace Bit.Core.Services
diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs
index 5085ee29a..f5d23c7f8 100644
--- a/src/Core/Settings/GlobalSettings.cs
+++ b/src/Core/Settings/GlobalSettings.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Settings
+namespace Bit.Core.Settings
 {
     public class GlobalSettings : IGlobalSettings
     {
diff --git a/src/Core/Settings/IInstallationSettings.cs b/src/Core/Settings/IInstallationSettings.cs
index f78b13db2..dbc966d54 100644
--- a/src/Core/Settings/IInstallationSettings.cs
+++ b/src/Core/Settings/IInstallationSettings.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Settings
+namespace Bit.Core.Settings
 {
     public interface IInstallationSettings
     {
diff --git a/src/Core/Sso/SamlSigningAlgorithms.cs b/src/Core/Sso/SamlSigningAlgorithms.cs
index b1a545301..fba67a4ab 100644
--- a/src/Core/Sso/SamlSigningAlgorithms.cs
+++ b/src/Core/Sso/SamlSigningAlgorithms.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Core.Sso
+namespace Bit.Core.Sso
 {
     public static class SamlSigningAlgorithms
     {
diff --git a/src/Core/Tokens/BadTokenException.cs b/src/Core/Tokens/BadTokenException.cs
index 9a5d8f4da..ffd9cb520 100644
--- a/src/Core/Tokens/BadTokenException.cs
+++ b/src/Core/Tokens/BadTokenException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Tokens
+namespace Bit.Core.Tokens
 {
     public class BadTokenException : Exception
     {
diff --git a/src/Core/Tokens/ExpiringTokenable.cs b/src/Core/Tokens/ExpiringTokenable.cs
index cd7b66d22..37907bbe3 100644
--- a/src/Core/Tokens/ExpiringTokenable.cs
+++ b/src/Core/Tokens/ExpiringTokenable.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Tokens
diff --git a/src/Core/Tokens/IBillingSyncTokenable.cs b/src/Core/Tokens/IBillingSyncTokenable.cs
index f73940b8b..a9fdc06bd 100644
--- a/src/Core/Tokens/IBillingSyncTokenable.cs
+++ b/src/Core/Tokens/IBillingSyncTokenable.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Tokens
+namespace Bit.Core.Tokens
 {
     public interface IBillingSyncTokenable
     {
diff --git a/src/Core/Utilities/BillingHelpers.cs b/src/Core/Utilities/BillingHelpers.cs
index 662415a04..41202a2b4 100644
--- a/src/Core/Utilities/BillingHelpers.cs
+++ b/src/Core/Utilities/BillingHelpers.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 
diff --git a/src/Core/Utilities/BitPayClient.cs b/src/Core/Utilities/BitPayClient.cs
index a46e56209..2532e8476 100644
--- a/src/Core/Utilities/BitPayClient.cs
+++ b/src/Core/Utilities/BitPayClient.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 
 namespace Bit.Core.Utilities
 {
diff --git a/src/Core/Utilities/ClaimsExtensions.cs b/src/Core/Utilities/ClaimsExtensions.cs
index 5f1fe8832..ef25d1483 100644
--- a/src/Core/Utilities/ClaimsExtensions.cs
+++ b/src/Core/Utilities/ClaimsExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 
 namespace Bit.Core.Utilities
 {
diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index 3731e518f..71b872256 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
+using System.Globalization;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Web;
 using Azure;
 using Azure.Storage.Blobs;
diff --git a/src/Core/Utilities/CurrentContextMiddleware.cs b/src/Core/Utilities/CurrentContextMiddleware.cs
index 3e733ad00..bfba894dd 100644
--- a/src/Core/Utilities/CurrentContextMiddleware.cs
+++ b/src/Core/Utilities/CurrentContextMiddleware.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
 
diff --git a/src/Core/Utilities/CustomIpRateLimitMiddleware.cs b/src/Core/Utilities/CustomIpRateLimitMiddleware.cs
index fef57e8c1..c38700bde 100644
--- a/src/Core/Utilities/CustomIpRateLimitMiddleware.cs
+++ b/src/Core/Utilities/CustomIpRateLimitMiddleware.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using AspNetCoreRateLimit;
+using AspNetCoreRateLimit;
 using Bit.Core.Models.Api;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Core/Utilities/DuoApi.cs b/src/Core/Utilities/DuoApi.cs
index 4d473ae38..c98c98938 100644
--- a/src/Core/Utilities/DuoApi.cs
+++ b/src/Core/Utilities/DuoApi.cs
@@ -8,10 +8,7 @@ Copyright (c) 2018 Duo Security
 All rights reserved
 */
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Net;
 using System.Security.Cryptography;
 using System.Text;
diff --git a/src/Core/Utilities/DuoWeb.cs b/src/Core/Utilities/DuoWeb.cs
index b8f40d889..f8259d200 100644
--- a/src/Core/Utilities/DuoWeb.cs
+++ b/src/Core/Utilities/DuoWeb.cs
@@ -33,7 +33,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-using System;
 using System.Security.Cryptography;
 using System.Text;
 
diff --git a/src/Core/Utilities/EncryptedValueAttribute.cs b/src/Core/Utilities/EncryptedValueAttribute.cs
index 94c671d02..9ae43110b 100644
--- a/src/Core/Utilities/EncryptedValueAttribute.cs
+++ b/src/Core/Utilities/EncryptedValueAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Utilities
 {
diff --git a/src/Core/Utilities/EpochDateTimeJsonConverter.cs b/src/Core/Utilities/EpochDateTimeJsonConverter.cs
index 4f3b36c42..a9354fa6f 100644
--- a/src/Core/Utilities/EpochDateTimeJsonConverter.cs
+++ b/src/Core/Utilities/EpochDateTimeJsonConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Bit.Core.Utilities
diff --git a/src/Core/Utilities/HandlebarsObjectJsonConverter.cs b/src/Core/Utilities/HandlebarsObjectJsonConverter.cs
index f7de06cf9..2ba1d4002 100644
--- a/src/Core/Utilities/HandlebarsObjectJsonConverter.cs
+++ b/src/Core/Utilities/HandlebarsObjectJsonConverter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Bit.Core.Utilities
diff --git a/src/Core/Utilities/HostBuilderExtensions.cs b/src/Core/Utilities/HostBuilderExtensions.cs
index c8c227af3..2d54545ed 100644
--- a/src/Core/Utilities/HostBuilderExtensions.cs
+++ b/src/Core/Utilities/HostBuilderExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
diff --git a/src/Core/Utilities/JsonHelpers.cs b/src/Core/Utilities/JsonHelpers.cs
index 76eb97548..2f94fe84f 100644
--- a/src/Core/Utilities/JsonHelpers.cs
+++ b/src/Core/Utilities/JsonHelpers.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using NS = Newtonsoft.Json;
 
diff --git a/src/Core/Utilities/LoggerFactoryExtensions.cs b/src/Core/Utilities/LoggerFactoryExtensions.cs
index a62f1ab24..98896c56e 100644
--- a/src/Core/Utilities/LoggerFactoryExtensions.cs
+++ b/src/Core/Utilities/LoggerFactoryExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Security.Authentication;
+using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/Core/Utilities/SecurityHeadersMiddleware.cs b/src/Core/Utilities/SecurityHeadersMiddleware.cs
index 2f11ee331..3a1cc477e 100644
--- a/src/Core/Utilities/SecurityHeadersMiddleware.cs
+++ b/src/Core/Utilities/SecurityHeadersMiddleware.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
 namespace Bit.Core.Utilities
diff --git a/src/Core/Utilities/StaticStore.cs b/src/Core/Utilities/StaticStore.cs
index 0a37cf689..fd5f3ce9e 100644
--- a/src/Core/Utilities/StaticStore.cs
+++ b/src/Core/Utilities/StaticStore.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Models.StaticStore;
 
diff --git a/src/Core/Utilities/StrictEmailAddressListAttribute.cs b/src/Core/Utilities/StrictEmailAddressListAttribute.cs
index 994151f8b..dcff171cd 100644
--- a/src/Core/Utilities/StrictEmailAddressListAttribute.cs
+++ b/src/Core/Utilities/StrictEmailAddressListAttribute.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Utilities
 {
diff --git a/src/Events/Controllers/CollectController.cs b/src/Events/Controllers/CollectController.cs
index 73cda0695..2cdffb52f 100644
--- a/src/Events/Controllers/CollectController.cs
+++ b/src/Events/Controllers/CollectController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Events/Controllers/InfoController.cs b/src/Events/Controllers/InfoController.cs
index 3a14ea6f7..23234c654 100644
--- a/src/Events/Controllers/InfoController.cs
+++ b/src/Events/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Events.Controllers
diff --git a/src/Events/Models/EventModel.cs b/src/Events/Models/EventModel.cs
index 16f369dea..f491b1dca 100644
--- a/src/Events/Models/EventModel.cs
+++ b/src/Events/Models/EventModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Events.Models
 {
diff --git a/src/Events/Program.cs b/src/Events/Program.cs
index 9e234d007..a6a95646a 100644
--- a/src/Events/Program.cs
+++ b/src/Events/Program.cs
@@ -1,7 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Events
diff --git a/src/Events/Startup.cs b/src/Events/Startup.cs
index 6eb78da3a..7c777abb4 100644
--- a/src/Events/Startup.cs
+++ b/src/Events/Startup.cs
@@ -5,11 +5,6 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using IdentityModel;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Bit.Events
 {
diff --git a/src/EventsProcessor/AzureQueueHostedService.cs b/src/EventsProcessor/AzureQueueHostedService.cs
index c82278b90..41f203e9d 100644
--- a/src/EventsProcessor/AzureQueueHostedService.cs
+++ b/src/EventsProcessor/AzureQueueHostedService.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Azure.Storage.Queues;
 using Bit.Core;
 using Bit.Core.Models.Data;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.EventsProcessor
 {
diff --git a/src/EventsProcessor/Program.cs b/src/EventsProcessor/Program.cs
index 66f2192bc..a63c7742c 100644
--- a/src/EventsProcessor/Program.cs
+++ b/src/EventsProcessor/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.EventsProcessor
diff --git a/src/EventsProcessor/Startup.cs b/src/EventsProcessor/Startup.cs
index a09179a24..e995816a0 100644
--- a/src/EventsProcessor/Startup.cs
+++ b/src/EventsProcessor/Startup.cs
@@ -2,12 +2,6 @@
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Logging;
 
 namespace Bit.EventsProcessor
diff --git a/src/Icons/Controllers/IconsController.cs b/src/Icons/Controllers/IconsController.cs
index bc95dc69c..5e27ece56 100644
--- a/src/Icons/Controllers/IconsController.cs
+++ b/src/Icons/Controllers/IconsController.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Icons.Models;
+using Bit.Icons.Models;
 using Bit.Icons.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Icons.Controllers
 {
diff --git a/src/Icons/Controllers/InfoController.cs b/src/Icons/Controllers/InfoController.cs
index 7897569e8..47c6ca553 100644
--- a/src/Icons/Controllers/InfoController.cs
+++ b/src/Icons/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Icons.Controllers
diff --git a/src/Icons/Models/DomainName.cs b/src/Icons/Models/DomainName.cs
index 62aec630f..ee5a5f0d4 100644
--- a/src/Icons/Models/DomainName.cs
+++ b/src/Icons/Models/DomainName.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
+using System.Diagnostics;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
diff --git a/src/Icons/Models/IconResult.cs b/src/Icons/Models/IconResult.cs
index 9a22b1d67..104c2627a 100644
--- a/src/Icons/Models/IconResult.cs
+++ b/src/Icons/Models/IconResult.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Icons.Models
+namespace Bit.Icons.Models
 {
     public class IconResult
     {
diff --git a/src/Icons/Program.cs b/src/Icons/Program.cs
index 0fba98111..1f65ea406 100644
--- a/src/Icons/Program.cs
+++ b/src/Icons/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Icons
diff --git a/src/Icons/Services/DomainMappingService.cs b/src/Icons/Services/DomainMappingService.cs
index abd969b0f..406145af9 100644
--- a/src/Icons/Services/DomainMappingService.cs
+++ b/src/Icons/Services/DomainMappingService.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Bit.Icons.Services
+namespace Bit.Icons.Services
 {
     public class DomainMappingService : IDomainMappingService
     {
diff --git a/src/Icons/Services/IIconFetchingService.cs b/src/Icons/Services/IIconFetchingService.cs
index 433917e5d..4c15ddffb 100644
--- a/src/Icons/Services/IIconFetchingService.cs
+++ b/src/Icons/Services/IIconFetchingService.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Icons.Models;
+using Bit.Icons.Models;
 
 namespace Bit.Icons.Services
 {
diff --git a/src/Icons/Services/IconFetchingService.cs b/src/Icons/Services/IconFetchingService.cs
index 6450f7489..e7ae38450 100644
--- a/src/Icons/Services/IconFetchingService.cs
+++ b/src/Icons/Services/IconFetchingService.cs
@@ -1,14 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
+using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using AngleSharp.Html.Parser;
 using Bit.Icons.Models;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Icons.Services
 {
diff --git a/src/Icons/Startup.cs b/src/Icons/Startup.cs
index b8209f63f..71442772b 100644
--- a/src/Icons/Startup.cs
+++ b/src/Icons/Startup.cs
@@ -1,15 +1,8 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.Icons.Services;
 using Bit.SharedWeb.Utilities;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
 
 namespace Bit.Icons
diff --git a/src/Identity/Controllers/AccountsController.cs b/src/Identity/Controllers/AccountsController.cs
index bdf1358bf..d7151a3ee 100644
--- a/src/Identity/Controllers/AccountsController.cs
+++ b/src/Identity/Controllers/AccountsController.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Models.Api.Response.Accounts;
@@ -10,7 +8,6 @@ using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Identity.Controllers
 {
diff --git a/src/Identity/Controllers/InfoController.cs b/src/Identity/Controllers/InfoController.cs
index 9824ac93a..d8c161c61 100644
--- a/src/Identity/Controllers/InfoController.cs
+++ b/src/Identity/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Identity.Controllers
diff --git a/src/Identity/Controllers/SsoController.cs b/src/Identity/Controllers/SsoController.cs
index a7d0670e1..e3dc8f504 100644
--- a/src/Identity/Controllers/SsoController.cs
+++ b/src/Identity/Controllers/SsoController.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business.Tokenables;
@@ -13,10 +8,8 @@ using IdentityModel;
 using IdentityServer4;
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Identity.Controllers
 {
diff --git a/src/Identity/Program.cs b/src/Identity/Program.cs
index e6cc0b4b3..540e3ac75 100644
--- a/src/Identity/Program.cs
+++ b/src/Identity/Program.cs
@@ -1,7 +1,5 @@
 using AspNetCoreRateLimit;
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Identity
diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs
index 9ca7d4826..0636e2840 100644
--- a/src/Identity/Startup.cs
+++ b/src/Identity/Startup.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
-using System.Threading.Tasks;
 using AspNetCoreRateLimit;
 using Bit.Core;
 using Bit.Core.Context;
@@ -11,12 +9,6 @@ using Bit.Core.Utilities;
 using Bit.Identity.Utilities;
 using Bit.SharedWeb.Utilities;
 using IdentityServer4.Extensions;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Logging;
 
 namespace Bit.Identity
diff --git a/src/Identity/Utilities/DiscoveryResponseGenerator.cs b/src/Identity/Utilities/DiscoveryResponseGenerator.cs
index e4e008e28..32a5e6ddb 100644
--- a/src/Identity/Utilities/DiscoveryResponseGenerator.cs
+++ b/src/Identity/Utilities/DiscoveryResponseGenerator.cs
@@ -1,12 +1,9 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using IdentityServer4.Configuration;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using IdentityServer4.Validation;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Identity.Utilities
 {
diff --git a/src/Identity/Utilities/ServiceCollectionExtensions.cs b/src/Identity/Utilities/ServiceCollectionExtensions.cs
index ec8534781..82000ebcf 100644
--- a/src/Identity/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Identity/Utilities/ServiceCollectionExtensions.cs
@@ -1,14 +1,9 @@
-using System;
-using Bit.Core.IdentityServer;
+using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using IdentityServer4.ResponseHandling;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Bit.Identity.Utilities
 {
diff --git a/src/Infrastructure.Dapper/DapperHelpers.cs b/src/Infrastructure.Dapper/DapperHelpers.cs
index 0042ff4ef..720355649 100644
--- a/src/Infrastructure.Dapper/DapperHelpers.cs
+++ b/src/Infrastructure.Dapper/DapperHelpers.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Dapper;
diff --git a/src/Infrastructure.Dapper/Repositories/BaseRepository.cs b/src/Infrastructure.Dapper/Repositories/BaseRepository.cs
index 3c7701d3f..135f024a6 100644
--- a/src/Infrastructure.Dapper/Repositories/BaseRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/BaseRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using Dapper;
+using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
 {
diff --git a/src/Infrastructure.Dapper/Repositories/CipherRepository.cs b/src/Infrastructure.Dapper/Repositories/CipherRepository.cs
index ece35da73..33560aad5 100644
--- a/src/Infrastructure.Dapper/Repositories/CipherRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CipherRepository.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/CollectionCipherRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionCipherRepository.cs
index 62732ca6c..287697948 100644
--- a/src/Infrastructure.Dapper/Repositories/CollectionCipherRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CollectionCipherRepository.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
diff --git a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
index d21c5672d..ee8bc1e2e 100644
--- a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/DateTimeHandler.cs b/src/Infrastructure.Dapper/Repositories/DateTimeHandler.cs
index 91211d537..8aedf2321 100644
--- a/src/Infrastructure.Dapper/Repositories/DateTimeHandler.cs
+++ b/src/Infrastructure.Dapper/Repositories/DateTimeHandler.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Data;
+using System.Data;
 using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
diff --git a/src/Infrastructure.Dapper/Repositories/DeviceRepository.cs b/src/Infrastructure.Dapper/Repositories/DeviceRepository.cs
index e674cddd7..039ff90ae 100644
--- a/src/Infrastructure.Dapper/Repositories/DeviceRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/DeviceRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/EmergencyAccessRepository.cs b/src/Infrastructure.Dapper/Repositories/EmergencyAccessRepository.cs
index 0f987372b..c88664c7a 100644
--- a/src/Infrastructure.Dapper/Repositories/EmergencyAccessRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/EmergencyAccessRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/EventRepository.cs b/src/Infrastructure.Dapper/Repositories/EventRepository.cs
index 5279d0df2..82491cb03 100644
--- a/src/Infrastructure.Dapper/Repositories/EventRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/EventRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/FolderRepository.cs b/src/Infrastructure.Dapper/Repositories/FolderRepository.cs
index ea4bc78f7..a0bd11c9d 100644
--- a/src/Infrastructure.Dapper/Repositories/FolderRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/FolderRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/GrantRepository.cs b/src/Infrastructure.Dapper/Repositories/GrantRepository.cs
index 8a7b07980..6596fa510 100644
--- a/src/Infrastructure.Dapper/Repositories/GrantRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/GrantRepository.cs
@@ -1,8 +1,5 @@
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/GroupRepository.cs b/src/Infrastructure.Dapper/Repositories/GroupRepository.cs
index 678eb2bf6..31f6a29bb 100644
--- a/src/Infrastructure.Dapper/Repositories/GroupRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/GroupRepository.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
diff --git a/src/Infrastructure.Dapper/Repositories/InstallationRepository.cs b/src/Infrastructure.Dapper/Repositories/InstallationRepository.cs
index b32012bb2..b82b13c49 100644
--- a/src/Infrastructure.Dapper/Repositories/InstallationRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/InstallationRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 
diff --git a/src/Infrastructure.Dapper/Repositories/MaintenanceRepository.cs b/src/Infrastructure.Dapper/Repositories/MaintenanceRepository.cs
index e5c0850ed..05c6e9d63 100644
--- a/src/Infrastructure.Dapper/Repositories/MaintenanceRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/MaintenanceRepository.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Threading.Tasks;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Dapper;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationApiKeyRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationApiKeyRepository.cs
index 6f12b390d..b0694862f 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationApiKeyRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationApiKeyRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationConnectionRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationConnectionRepository.cs
index 827061ec9..6de4559fa 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationConnectionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationConnectionRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs
index 5d4f7ad5d..05cc3c92a 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationSponsorshipRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationSponsorshipRepository.cs
index fca28e0f9..6e4ca9904 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationSponsorshipRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationSponsorshipRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
index bc25076a1..913cd8f43 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
diff --git a/src/Infrastructure.Dapper/Repositories/PolicyRepository.cs b/src/Infrastructure.Dapper/Repositories/PolicyRepository.cs
index 50adc6cda..46cd6e29e 100644
--- a/src/Infrastructure.Dapper/Repositories/PolicyRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/PolicyRepository.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Dapper;
diff --git a/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs b/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs
index 82b883c40..282f1d273 100644
--- a/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs b/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs
index 6f56f58ca..4619771a5 100644
--- a/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs b/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs
index b11f5963e..98375ab6a 100644
--- a/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
diff --git a/src/Infrastructure.Dapper/Repositories/Repository.cs b/src/Infrastructure.Dapper/Repositories/Repository.cs
index e1c524430..4bc0b91b1 100644
--- a/src/Infrastructure.Dapper/Repositories/Repository.cs
+++ b/src/Infrastructure.Dapper/Repositories/Repository.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Dapper;
diff --git a/src/Infrastructure.Dapper/Repositories/SendRepository.cs b/src/Infrastructure.Dapper/Repositories/SendRepository.cs
index fa74f2603..6d8ba6c19 100644
--- a/src/Infrastructure.Dapper/Repositories/SendRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/SendRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/SsoConfigRepository.cs b/src/Infrastructure.Dapper/Repositories/SsoConfigRepository.cs
index 26aef4081..70d527c1c 100644
--- a/src/Infrastructure.Dapper/Repositories/SsoConfigRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/SsoConfigRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/SsoUserRepository.cs b/src/Infrastructure.Dapper/Repositories/SsoUserRepository.cs
index 2249204e3..fd32c708d 100644
--- a/src/Infrastructure.Dapper/Repositories/SsoUserRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/SsoUserRepository.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/TaxRateRepository.cs b/src/Infrastructure.Dapper/Repositories/TaxRateRepository.cs
index 8914b8835..1c9982e01 100644
--- a/src/Infrastructure.Dapper/Repositories/TaxRateRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/TaxRateRepository.cs
@@ -1,8 +1,5 @@
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Repositories/TransactionRepository.cs b/src/Infrastructure.Dapper/Repositories/TransactionRepository.cs
index a4c1b7b53..ed8b16f91 100644
--- a/src/Infrastructure.Dapper/Repositories/TransactionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/TransactionRepository.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/UserRepository.cs b/src/Infrastructure.Dapper/Repositories/UserRepository.cs
index fe5436f1d..077fdd59a 100644
--- a/src/Infrastructure.Dapper/Repositories/UserRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/UserRepository.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Dapper;
 
 namespace Bit.Infrastructure.Dapper.Repositories
diff --git a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
index b0efbed02..d97a6493e 100644
--- a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
+++ b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using AutoMapper;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using LinqToDB.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Models/Cipher.cs b/src/Infrastructure.EntityFramework/Models/Cipher.cs
index 06cbcb04a..4cf008d52 100644
--- a/src/Infrastructure.EntityFramework/Models/Cipher.cs
+++ b/src/Infrastructure.EntityFramework/Models/Cipher.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Models/Collection.cs b/src/Infrastructure.EntityFramework/Models/Collection.cs
index 07ffd8d58..2e4337238 100644
--- a/src/Infrastructure.EntityFramework/Models/Collection.cs
+++ b/src/Infrastructure.EntityFramework/Models/Collection.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Models/Group.cs b/src/Infrastructure.EntityFramework/Models/Group.cs
index 3ae89f9d5..98f482012 100644
--- a/src/Infrastructure.EntityFramework/Models/Group.cs
+++ b/src/Infrastructure.EntityFramework/Models/Group.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Models/Organization.cs b/src/Infrastructure.EntityFramework/Models/Organization.cs
index c5708628f..3d46027ef 100644
--- a/src/Infrastructure.EntityFramework/Models/Organization.cs
+++ b/src/Infrastructure.EntityFramework/Models/Organization.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Models/OrganizationUser.cs b/src/Infrastructure.EntityFramework/Models/OrganizationUser.cs
index 255e35c5d..f1489bd46 100644
--- a/src/Infrastructure.EntityFramework/Models/OrganizationUser.cs
+++ b/src/Infrastructure.EntityFramework/Models/OrganizationUser.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Models/User.cs b/src/Infrastructure.EntityFramework/Models/User.cs
index 80a579c9b..9ff81e90b 100644
--- a/src/Infrastructure.EntityFramework/Models/User.cs
+++ b/src/Infrastructure.EntityFramework/Models/User.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Infrastructure.EntityFramework.Models
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/BaseEntityFrameworkRepository.cs b/src/Infrastructure.EntityFramework/Repositories/BaseEntityFrameworkRepository.cs
index 8ab5bac61..833994fc5 100644
--- a/src/Infrastructure.EntityFramework/Repositories/BaseEntityFrameworkRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/BaseEntityFrameworkRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
diff --git a/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
index 381111e40..fdf528393 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs
index 93f7180e7..1d717ce2e 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index c0109cec8..74d714bb1 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
index 5e96686b8..8d3af7a4f 100644
--- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@@ -1,6 +1,4 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories
diff --git a/src/Infrastructure.EntityFramework/Repositories/DeviceRepository.cs b/src/Infrastructure.EntityFramework/Repositories/DeviceRepository.cs
index 62e84ce92..79ad60818 100644
--- a/src/Infrastructure.EntityFramework/Repositories/DeviceRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DeviceRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/EmergencyAccessRepository.cs b/src/Infrastructure.EntityFramework/Repositories/EmergencyAccessRepository.cs
index ecddaa23d..4ace88560 100644
--- a/src/Infrastructure.EntityFramework/Repositories/EmergencyAccessRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/EmergencyAccessRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Repositories/EventRepository.cs b/src/Infrastructure.EntityFramework/Repositories/EventRepository.cs
index 890f6761b..712885245 100644
--- a/src/Infrastructure.EntityFramework/Repositories/EventRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/EventRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
diff --git a/src/Infrastructure.EntityFramework/Repositories/FolderRepository.cs b/src/Infrastructure.EntityFramework/Repositories/FolderRepository.cs
index 937bdd7d5..dae64f9c2 100644
--- a/src/Infrastructure.EntityFramework/Repositories/FolderRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/FolderRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/GrantRepository.cs b/src/Infrastructure.EntityFramework/Repositories/GrantRepository.cs
index 707b4bd24..0f8f197fe 100644
--- a/src/Infrastructure.EntityFramework/Repositories/GrantRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/GrantRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs b/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
index 1d127854e..b471a5fdb 100644
--- a/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
diff --git a/src/Infrastructure.EntityFramework/Repositories/InstallationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/InstallationRepository.cs
index 7e0f76db7..1cc4808c3 100644
--- a/src/Infrastructure.EntityFramework/Repositories/InstallationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/InstallationRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Infrastructure.EntityFramework/Repositories/MaintenanceRepository.cs b/src/Infrastructure.EntityFramework/Repositories/MaintenanceRepository.cs
index 208ed36c4..e91d775cc 100644
--- a/src/Infrastructure.EntityFramework/Repositories/MaintenanceRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/MaintenanceRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationApiKeyRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationApiKeyRepository.cs
index debcaade6..8bc462adf 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationApiKeyRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationApiKeyRepository.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
-using Bit.Core.Utilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationConnectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationConnectionRepository.cs
index 5c7e4e0e6..5acd8807d 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationConnectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationConnectionRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
index 6d72acc7d..ce08935a4 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationSponsorshipRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationSponsorshipRepository.cs
index e5bee132f..9e00d924d 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationSponsorshipRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationSponsorshipRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
index 96f43ca97..226c51c0f 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Infrastructure.EntityFramework/Repositories/PolicyRepository.cs b/src/Infrastructure.EntityFramework/Repositories/PolicyRepository.cs
index c9c2752e9..8d6a92809 100644
--- a/src/Infrastructure.EntityFramework/Repositories/PolicyRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/PolicyRepository.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs
index 7b1a01c25..dd5271fcd 100644
--- a/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs b/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs
index de5431840..75c8788c6 100644
--- a/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs
index 6f9121518..87d82a542 100644
--- a/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs
index d7b135ef5..38c451c3f 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByIdQuery.cs
index b10b1bab2..2bca0c11a 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Core.Models.Data;
+using Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByOrgizationIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByOrgizationIdQuery.cs
index 0a02ccfb7..84d2779a1 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByOrgizationIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherOrganizationDetailsReadByOrgizationIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Core.Models.Data;
+using Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs
index 9814a40cd..ab9a32b52 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherUpdateCollectionsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherUpdateCollectionsQuery.cs
index 012676f22..25be9135a 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherUpdateCollectionsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherUpdateCollectionsQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using CollectionCipher = Bit.Infrastructure.EntityFramework.Models.CollectionCipher;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdCipherIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdCipherIdQuery.cs
index 120635fc2..51fcb15fd 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdCipherIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdCipherIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs
index 1c4a55dcb..6c8e17372 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionReadCountByOrganizationIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionReadCountByOrganizationIdQuery.cs
index 5590c371e..de878db34 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionReadCountByOrganizationIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionReadCountByOrganizationIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionUserUpdateUsersQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionUserUpdateUsersQuery.cs
index 1d23e9c43..45023772a 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionUserUpdateUsersQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionUserUpdateUsersQuery.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessDetailsViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessDetailsViewQuery.cs
index c975fc566..24c1bda8d 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessDetailsViewQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessDetailsViewQuery.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs
index 4bfbe80d2..d28ce1372 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByCipherIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByCipherIdQuery.cs
index 45a7bc766..d94d130ef 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByCipherIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByCipherIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Event = Bit.Infrastructure.EntityFramework.Models.Event;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdActingUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdActingUserIdQuery.cs
index 934e7d0cd..f9553dd38 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdActingUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdActingUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdQuery.cs
index 5a8f3d004..261bef32a 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByOrganizationIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdActingUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdActingUserIdQuery.cs
index cf777ef0f..4b08ecf2b 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdActingUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdActingUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdQuery.cs
index b7650c505..49e8f518b 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByProviderIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByUserIdQuery.cs
index 6789f69af..3e7ff4cc3 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/EventReadPageByUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/GroupUserUpdateGroupsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/GroupUserUpdateGroupsQuery.cs
index e71ae9822..580199caf 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/GroupUserUpdateGroupsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/GroupUserUpdateGroupsQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/IQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/IQuery.cs
index 5cad41af5..8729f5b15 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/IQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/IQuery.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
+namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
     public interface IQuery<TOut>
     {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs
index cd9cb7314..5d82ee718 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Models.Data.Organizations.OrganizationUsers;
+using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByFreeOrganizationAdminUserQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByFreeOrganizationAdminUserQuery.cs
index d3c90dcd2..26c66fce9 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByFreeOrganizationAdminUserQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByFreeOrganizationAdminUserQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOnlyOwnerQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOnlyOwnerQuery.cs
index ccc0b72b1..6cf8e3c3b 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOnlyOwnerQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOnlyOwnerQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdEmailQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdEmailQuery.cs
index fdc476c2a..ed4c786c7 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdEmailQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdEmailQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdQuery.cs
index 2f08d6efd..05c6dd049 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserReadCountByOrganizationIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUpdateWithCollectionsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUpdateWithCollectionsQuery.cs
index ff03388f4..10dbf88d7 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUpdateWithCollectionsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUpdateWithCollectionsQuery.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using CollectionUser = Bit.Infrastructure.EntityFramework.Models.CollectionUser;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
index 9f96ccd39..248957196 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Models.Data.Organizations.OrganizationUsers;
+using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByTypeApplicableToUserQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByTypeApplicableToUserQuery.cs
index 017e42072..bd69570ec 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByTypeApplicableToUserQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByTypeApplicableToUserQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByUserIdQuery.cs
index b5c05a3bc..e910e2f75 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/PolicyReadByUserIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs
index c120cf80e..e73215ffd 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs
index 0fe7cdb89..187426dfb 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Models.Data;
+using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
 {
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs
index 1d79251be..efa768123 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserReadCountByOnlyOwnerQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserReadCountByOnlyOwnerQuery.cs
index 5e43fb120..fd6e8521d 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserReadCountByOnlyOwnerQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserReadCountByOnlyOwnerQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs
index 5a0f1c7f0..6fcf15ab4 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using User = Bit.Infrastructure.EntityFramework.Models.User;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByOrganizationIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByOrganizationIdQuery.cs
index da90f35f4..87c2bcf08 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByOrganizationIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByOrganizationIdQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
index 2a27473f8..3417abd30 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Core.Models.Data;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs
index 5d5eb5289..c2325f10f 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs
index 0a4c7d73e..10782e0ea 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums.Provider;
+using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
diff --git a/src/Infrastructure.EntityFramework/Repositories/Repository.cs b/src/Infrastructure.EntityFramework/Repositories/Repository.cs
index 3bd866969..2d933da80 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Repository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Repository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
diff --git a/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs b/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs
index 604c4abab..691a86c3b 100644
--- a/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/SsoConfigRepository.cs b/src/Infrastructure.EntityFramework/Repositories/SsoConfigRepository.cs
index bceec6068..8c0d22165 100644
--- a/src/Infrastructure.EntityFramework/Repositories/SsoConfigRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/SsoConfigRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/SsoUserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/SsoUserRepository.cs
index edbf66e31..c413648dc 100644
--- a/src/Infrastructure.EntityFramework/Repositories/SsoUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/SsoUserRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/TaxRateRepository.cs b/src/Infrastructure.EntityFramework/Repositories/TaxRateRepository.cs
index 1e71b39e9..a575892d4 100644
--- a/src/Infrastructure.EntityFramework/Repositories/TaxRateRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/TaxRateRepository.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure.EntityFramework/Repositories/TransactionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/TransactionRepository.cs
index de485a87c..fad4389ed 100644
--- a/src/Infrastructure.EntityFramework/Repositories/TransactionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/TransactionRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
diff --git a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
index 86ff37a5a..4074debf2 100644
--- a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Notifications/AzureQueueHostedService.cs b/src/Notifications/AzureQueueHostedService.cs
index 87a4347fd..edc735d86 100644
--- a/src/Notifications/AzureQueueHostedService.cs
+++ b/src/Notifications/AzureQueueHostedService.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Storage.Queues;
+using Azure.Storage.Queues;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Notifications
 {
diff --git a/src/Notifications/ConnectionCounter.cs b/src/Notifications/ConnectionCounter.cs
index 37cf5069d..330b8ee6d 100644
--- a/src/Notifications/ConnectionCounter.cs
+++ b/src/Notifications/ConnectionCounter.cs
@@ -1,6 +1,4 @@
-using System.Threading;
-
-namespace Bit.Notifications
+namespace Bit.Notifications
 {
     public class ConnectionCounter
     {
diff --git a/src/Notifications/Controllers/InfoController.cs b/src/Notifications/Controllers/InfoController.cs
index d91697243..402fc4937 100644
--- a/src/Notifications/Controllers/InfoController.cs
+++ b/src/Notifications/Controllers/InfoController.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Notifications.Controllers
diff --git a/src/Notifications/Controllers/SendController.cs b/src/Notifications/Controllers/SendController.cs
index 773879fcd..81698c911 100644
--- a/src/Notifications/Controllers/SendController.cs
+++ b/src/Notifications/Controllers/SendController.cs
@@ -1,6 +1,4 @@
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Notifications/HeartbeatHostedService.cs b/src/Notifications/HeartbeatHostedService.cs
index 3cb2eda25..e91666926 100644
--- a/src/Notifications/HeartbeatHostedService.cs
+++ b/src/Notifications/HeartbeatHostedService.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Bit.Notifications
 {
diff --git a/src/Notifications/HubHelpers.cs b/src/Notifications/HubHelpers.cs
index 853dd7d4c..2ba0037f4 100644
--- a/src/Notifications/HubHelpers.cs
+++ b/src/Notifications/HubHelpers.cs
@@ -1,6 +1,4 @@
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Microsoft.AspNetCore.SignalR;
diff --git a/src/Notifications/Jobs/JobsHostedService.cs b/src/Notifications/Jobs/JobsHostedService.cs
index 3d78083c6..326e8dce0 100644
--- a/src/Notifications/Jobs/JobsHostedService.cs
+++ b/src/Notifications/Jobs/JobsHostedService.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Settings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Notifications.Jobs
diff --git a/src/Notifications/Jobs/LogConnectionCounterJob.cs b/src/Notifications/Jobs/LogConnectionCounterJob.cs
index b736bd44f..6b7bc70ff 100644
--- a/src/Notifications/Jobs/LogConnectionCounterJob.cs
+++ b/src/Notifications/Jobs/LogConnectionCounterJob.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core;
+using Bit.Core;
 using Bit.Core.Jobs;
-using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace Bit.Notifications.Jobs
diff --git a/src/Notifications/NotificationsHub.cs b/src/Notifications/NotificationsHub.cs
index 5720cf7b0..7d6e94a42 100644
--- a/src/Notifications/NotificationsHub.cs
+++ b/src/Notifications/NotificationsHub.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 
diff --git a/src/Notifications/Program.cs b/src/Notifications/Program.cs
index b5c3f941d..8ea3a5a1b 100644
--- a/src/Notifications/Program.cs
+++ b/src/Notifications/Program.cs
@@ -1,6 +1,4 @@
 using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Serilog.Events;
 
 namespace Bit.Notifications
diff --git a/src/Notifications/Startup.cs b/src/Notifications/Startup.cs
index 9a5a17d1d..c42b9fcd2 100644
--- a/src/Notifications/Startup.cs
+++ b/src/Notifications/Startup.cs
@@ -1,15 +1,9 @@
-using System.Collections.Generic;
-using System.Globalization;
+using System.Globalization;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using IdentityModel;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Logging;
 
 namespace Bit.Notifications
diff --git a/src/SharedWeb/Utilities/ExceptionHandlerFilterAttribute.cs b/src/SharedWeb/Utilities/ExceptionHandlerFilterAttribute.cs
index 8723673df..2de2a4d73 100644
--- a/src/SharedWeb/Utilities/ExceptionHandlerFilterAttribute.cs
+++ b/src/SharedWeb/Utilities/ExceptionHandlerFilterAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Exceptions;
+using Bit.Core.Exceptions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -7,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
-using Stripe;
 using InternalApi = Bit.Core.Models.Api;
 
 namespace Bit.SharedWeb.Utilities
diff --git a/src/SharedWeb/Utilities/ModelStateValidationFilterAttribute.cs b/src/SharedWeb/Utilities/ModelStateValidationFilterAttribute.cs
index f0f087301..11d642f32 100644
--- a/src/SharedWeb/Utilities/ModelStateValidationFilterAttribute.cs
+++ b/src/SharedWeb/Utilities/ModelStateValidationFilterAttribute.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
index 1b6e26f88..a05e1083a 100644
--- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
+++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
+using System.Reflection;
 using System.Security.Claims;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Identity;
diff --git a/test/Api.Test/AutoFixture/Attributes/ControllerCustomizeAttribute.cs b/test/Api.Test/AutoFixture/Attributes/ControllerCustomizeAttribute.cs
index 353b2b752..61f0ff488 100644
--- a/test/Api.Test/AutoFixture/Attributes/ControllerCustomizeAttribute.cs
+++ b/test/Api.Test/AutoFixture/Attributes/ControllerCustomizeAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.Api.Test.AutoFixture.Attributes
diff --git a/test/Api.Test/AutoFixture/ControllerCustomization.cs b/test/Api.Test/AutoFixture/ControllerCustomization.cs
index 0c4179388..372594fd2 100644
--- a/test/Api.Test/AutoFixture/ControllerCustomization.cs
+++ b/test/Api.Test/AutoFixture/ControllerCustomization.cs
@@ -1,10 +1,6 @@
-using System;
-using AutoFixture;
-using AutoFixture.Kernel;
-using Bit.Api.Controllers;
+using AutoFixture;
 using Bit.Test.Common.AutoFixture;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Org.BouncyCastle.Security;
 
 namespace Bit.Api.Test.AutoFixture
diff --git a/test/Api.Test/Controllers/AccountsControllerTests.cs b/test/Api.Test/Controllers/AccountsControllerTests.cs
index 0124eaf89..51d76c544 100644
--- a/test/Api.Test/Controllers/AccountsControllerTests.cs
+++ b/test/Api.Test/Controllers/AccountsControllerTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Bit.Api.Controllers;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Core.Entities;
diff --git a/test/Api.Test/Controllers/CollectionsControllerTests.cs b/test/Api.Test/Controllers/CollectionsControllerTests.cs
index 47a6d34d1..aec4f28f6 100644
--- a/test/Api.Test/Controllers/CollectionsControllerTests.cs
+++ b/test/Api.Test/Controllers/CollectionsControllerTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Controllers;
+using Bit.Api.Controllers;
 using Bit.Api.Models.Request;
 using Bit.Api.Test.AutoFixture.Attributes;
 using Bit.Core.Context;
diff --git a/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs b/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
index ea36c5be2..b3743f9fd 100644
--- a/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Api.Controllers;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response.Organizations;
diff --git a/test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs b/test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs
index 9364b4be2..d30d4328c 100644
--- a/test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Controllers;
+using Bit.Api.Controllers;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Test.AutoFixture.Attributes;
 using Bit.Core.Context;
diff --git a/test/Api.Test/Controllers/OrganizationUsersControllerTests.cs b/test/Api.Test/Controllers/OrganizationUsersControllerTests.cs
index 4ac6ab0fd..ec5805563 100644
--- a/test/Api.Test/Controllers/OrganizationUsersControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationUsersControllerTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Api.Controllers;
+using Bit.Api.Controllers;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Test.AutoFixture.Attributes;
 using Bit.Core.Entities;
diff --git a/test/Api.Test/Controllers/OrganizationsControllerTests.cs b/test/Api.Test/Controllers/OrganizationsControllerTests.cs
index 323d10270..f31c31927 100644
--- a/test/Api.Test/Controllers/OrganizationsControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationsControllerTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using AutoFixture.Xunit2;
 using Bit.Api.Controllers;
 using Bit.Core.Context;
diff --git a/test/Api.Test/Controllers/SendsControllerTests.cs b/test/Api.Test/Controllers/SendsControllerTests.cs
index 47122edb9..e86d95c55 100644
--- a/test/Api.Test/Controllers/SendsControllerTests.cs
+++ b/test/Api.Test/Controllers/SendsControllerTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using AutoFixture.Xunit2;
 using Bit.Api.Controllers;
 using Bit.Api.Models.Request;
diff --git a/test/Api.Test/Models/Request/Accounts/PremiumRequestModelTests.cs b/test/Api.Test/Models/Request/Accounts/PremiumRequestModelTests.cs
index 1f3c7cbb8..6d01e0a15 100644
--- a/test/Api.Test/Models/Request/Accounts/PremiumRequestModelTests.cs
+++ b/test/Api.Test/Models/Request/Accounts/PremiumRequestModelTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Request.Accounts;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
 using Xunit;
diff --git a/test/Api.Test/Models/Request/SendRequestModelTests.cs b/test/Api.Test/Models/Request/SendRequestModelTests.cs
index 01b2587f7..ffcf043bd 100644
--- a/test/Api.Test/Models/Request/SendRequestModelTests.cs
+++ b/test/Api.Test/Models/Request/SendRequestModelTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Api.Models;
 using Bit.Api.Models.Request;
 using Bit.Core.Enums;
diff --git a/test/Api.Test/Utilities/ApiHelpersTests.cs b/test/Api.Test/Utilities/ApiHelpersTests.cs
index 3e2181c8d..718ec2eeb 100644
--- a/test/Api.Test/Utilities/ApiHelpersTests.cs
+++ b/test/Api.Test/Utilities/ApiHelpersTests.cs
@@ -1,7 +1,4 @@
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
+using System.Text;
 using Bit.Api.Utilities;
 using Bit.Core.Models.Business;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Billing.Test/Controllers/FreshsalesControllerTests.cs b/test/Billing.Test/Controllers/FreshsalesControllerTests.cs
index f922560db..490f4051a 100644
--- a/test/Billing.Test/Controllers/FreshsalesControllerTests.cs
+++ b/test/Billing.Test/Controllers/FreshsalesControllerTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Billing.Controllers;
+using Bit.Billing.Controllers;
 using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
diff --git a/test/Common/AutoFixture/Attributes/BitAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/BitAutoDataAttribute.cs
index a32259f3c..7185468ea 100644
--- a/test/Common/AutoFixture/Attributes/BitAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/BitAutoDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using Bit.Test.Common.Helpers;
 using Xunit.Sdk;
diff --git a/test/Common/AutoFixture/Attributes/BitCustomizeAttribute.cs b/test/Common/AutoFixture/Attributes/BitCustomizeAttribute.cs
index f599308bf..9b9a5142d 100644
--- a/test/Common/AutoFixture/Attributes/BitCustomizeAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/BitCustomizeAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
 {
diff --git a/test/Common/AutoFixture/Attributes/BitMemberAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/BitMemberAutoDataAttribute.cs
index fd68f2759..e9604e1c9 100644
--- a/test/Common/AutoFixture/Attributes/BitMemberAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/BitMemberAutoDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using Bit.Test.Common.Helpers;
 using Xunit;
diff --git a/test/Common/AutoFixture/Attributes/CustomAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/CustomAutoDataAttribute.cs
index d6c5863b1..75308e448 100644
--- a/test/Common/AutoFixture/Attributes/CustomAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/CustomAutoDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Xunit2;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
diff --git a/test/Common/AutoFixture/Attributes/EnvironmentDataAttribute.cs b/test/Common/AutoFixture/Attributes/EnvironmentDataAttribute.cs
index e77738d30..5479d766d 100644
--- a/test/Common/AutoFixture/Attributes/EnvironmentDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/EnvironmentDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using Xunit.Sdk;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
diff --git a/test/Common/AutoFixture/Attributes/InlineCustomAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/InlineCustomAutoDataAttribute.cs
index 9a9a6730a..b8c27f746 100644
--- a/test/Common/AutoFixture/Attributes/InlineCustomAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/InlineCustomAutoDataAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Xunit2;
 using Xunit;
 using Xunit.Sdk;
diff --git a/test/Common/AutoFixture/Attributes/InlineSutAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/InlineSutAutoDataAttribute.cs
index cc04e062a..b2709a330 100644
--- a/test/Common/AutoFixture/Attributes/InlineSutAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/InlineSutAutoDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using AutoFixture;
+using AutoFixture;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
 {
diff --git a/test/Common/AutoFixture/Attributes/RequiredEnvironmentTheoryAttribute.cs b/test/Common/AutoFixture/Attributes/RequiredEnvironmentTheoryAttribute.cs
index c1be90996..183001063 100644
--- a/test/Common/AutoFixture/Attributes/RequiredEnvironmentTheoryAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/RequiredEnvironmentTheoryAttribute.cs
@@ -1,5 +1,4 @@
-using System;
-using Xunit;
+using Xunit;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
 {
diff --git a/test/Common/AutoFixture/Attributes/SutAutoDataAttribute.cs b/test/Common/AutoFixture/Attributes/SutAutoDataAttribute.cs
index 9f7c7fab8..3680f4a66 100644
--- a/test/Common/AutoFixture/Attributes/SutAutoDataAttribute.cs
+++ b/test/Common/AutoFixture/Attributes/SutAutoDataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using AutoFixture;
+using AutoFixture;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
 {
diff --git a/test/Common/AutoFixture/BuilderWithoutAutoProperties.cs b/test/Common/AutoFixture/BuilderWithoutAutoProperties.cs
index e5902b8a4..b2bdae0d4 100644
--- a/test/Common/AutoFixture/BuilderWithoutAutoProperties.cs
+++ b/test/Common/AutoFixture/BuilderWithoutAutoProperties.cs
@@ -1,6 +1,4 @@
-using System;
-using AutoFixture;
-using AutoFixture.Dsl;
+using AutoFixture;
 using AutoFixture.Kernel;
 
 namespace Bit.Test.Common.AutoFixture
diff --git a/test/Common/AutoFixture/GlobalSettingsFixtures.cs b/test/Common/AutoFixture/GlobalSettingsFixtures.cs
index 4d0e7e0aa..6da4245be 100644
--- a/test/Common/AutoFixture/GlobalSettingsFixtures.cs
+++ b/test/Common/AutoFixture/GlobalSettingsFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using AutoFixture.Kernel;
 using AutoFixture.Xunit2;
diff --git a/test/Common/AutoFixture/ISutProvider.cs b/test/Common/AutoFixture/ISutProvider.cs
index cbd8c6e6f..9f6b0b23a 100644
--- a/test/Common/AutoFixture/ISutProvider.cs
+++ b/test/Common/AutoFixture/ISutProvider.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Test.Common.AutoFixture
+namespace Bit.Test.Common.AutoFixture
 {
     public interface ISutProvider
     {
diff --git a/test/Common/AutoFixture/JsonDocumentFixtures.cs b/test/Common/AutoFixture/JsonDocumentFixtures.cs
index 9f2c9e22a..e39b7f990 100644
--- a/test/Common/AutoFixture/JsonDocumentFixtures.cs
+++ b/test/Common/AutoFixture/JsonDocumentFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
 
diff --git a/test/Common/AutoFixture/SutProvider.cs b/test/Common/AutoFixture/SutProvider.cs
index 32578ead9..2b00ed0cf 100644
--- a/test/Common/AutoFixture/SutProvider.cs
+++ b/test/Common/AutoFixture/SutProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using AutoFixture.Kernel;
 
diff --git a/test/Common/AutoFixture/SutProviderCustomization.cs b/test/Common/AutoFixture/SutProviderCustomization.cs
index b72ff0329..148592394 100644
--- a/test/Common/AutoFixture/SutProviderCustomization.cs
+++ b/test/Common/AutoFixture/SutProviderCustomization.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 
 namespace Bit.Test.Common.AutoFixture.Attributes
diff --git a/test/Common/Helpers/AssertHelper.cs b/test/Common/Helpers/AssertHelper.cs
index cb853067b..75ea84b11 100644
--- a/test/Common/Helpers/AssertHelper.cs
+++ b/test/Common/Helpers/AssertHelper.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
+using System.Diagnostics;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Http;
 using Xunit;
diff --git a/test/Common/Helpers/BitAutoDataAttributeHelpers.cs b/test/Common/Helpers/BitAutoDataAttributeHelpers.cs
index 0e9d6112b..aae8d72dc 100644
--- a/test/Common/Helpers/BitAutoDataAttributeHelpers.cs
+++ b/test/Common/Helpers/BitAutoDataAttributeHelpers.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using AutoFixture.Kernel;
 using AutoFixture.Xunit2;
diff --git a/test/Common/Helpers/TestCaseHelper.cs b/test/Common/Helpers/TestCaseHelper.cs
index 350c33e26..c31d66e17 100644
--- a/test/Common/Helpers/TestCaseHelper.cs
+++ b/test/Common/Helpers/TestCaseHelper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Bit.Test.Common.Helpers
+namespace Bit.Test.Common.Helpers
 {
     public static class TestCaseHelper
     {
diff --git a/test/Common/Test/TestCaseHelperTests.cs b/test/Common/Test/TestCaseHelperTests.cs
index 07a8e10f4..697899813 100644
--- a/test/Common/Test/TestCaseHelperTests.cs
+++ b/test/Common/Test/TestCaseHelperTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Bit.Test.Common.Helpers;
+using Bit.Test.Common.Helpers;
 using Xunit;
 
 namespace Bit.Test.Common.Test
diff --git a/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs b/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs
index 8db3742ab..90981704f 100644
--- a/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs
+++ b/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bit.Core.Test.AutoFixture.Attributes
+namespace Bit.Core.Test.AutoFixture.Attributes
 {
     public sealed class CiSkippedTheory : Xunit.TheoryAttribute
     {
diff --git a/test/Core.Test/AutoFixture/CipherFixtures.cs b/test/Core.Test/AutoFixture/CipherFixtures.cs
index 09600649d..69abb2a6d 100644
--- a/test/Core.Test/AutoFixture/CipherFixtures.cs
+++ b/test/Core.Test/AutoFixture/CipherFixtures.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
diff --git a/test/Core.Test/AutoFixture/CollectionCipherFixtures.cs b/test/Core.Test/AutoFixture/CollectionCipherFixtures.cs
index 52513c2d1..812fd6708 100644
--- a/test/Core.Test/AutoFixture/CollectionCipherFixtures.cs
+++ b/test/Core.Test/AutoFixture/CollectionCipherFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.CipherFixtures;
diff --git a/test/Core.Test/AutoFixture/CollectionFixtures.cs b/test/Core.Test/AutoFixture/CollectionFixtures.cs
index 2ad602983..c1c18a4fc 100644
--- a/test/Core.Test/AutoFixture/CollectionFixtures.cs
+++ b/test/Core.Test/AutoFixture/CollectionFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/CurrentContextFixtures.cs b/test/Core.Test/AutoFixture/CurrentContextFixtures.cs
index 13d6ed1ed..90187cf6e 100644
--- a/test/Core.Test/AutoFixture/CurrentContextFixtures.cs
+++ b/test/Core.Test/AutoFixture/CurrentContextFixtures.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Context;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/Core.Test/AutoFixture/DeviceFixtures.cs b/test/Core.Test/AutoFixture/DeviceFixtures.cs
index 2be71edbb..42ba08b2e 100644
--- a/test/Core.Test/AutoFixture/DeviceFixtures.cs
+++ b/test/Core.Test/AutoFixture/DeviceFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/EmergencyAccessFixtures.cs b/test/Core.Test/AutoFixture/EmergencyAccessFixtures.cs
index 4fbcab41b..cdcdc95e4 100644
--- a/test/Core.Test/AutoFixture/EmergencyAccessFixtures.cs
+++ b/test/Core.Test/AutoFixture/EmergencyAccessFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs b/test/Core.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
index aea526704..645ccc975 100644
--- a/test/Core.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
+++ b/test/Core.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using AutoFixture;
 using AutoFixture.Kernel;
 using AutoMapper;
diff --git a/test/Core.Test/AutoFixture/EventFixtures.cs b/test/Core.Test/AutoFixture/EventFixtures.cs
index 660345f2f..a63a45f28 100644
--- a/test/Core.Test/AutoFixture/EventFixtures.cs
+++ b/test/Core.Test/AutoFixture/EventFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/FolderFixtures.cs b/test/Core.Test/AutoFixture/FolderFixtures.cs
index 0d4534598..52b704352 100644
--- a/test/Core.Test/AutoFixture/FolderFixtures.cs
+++ b/test/Core.Test/AutoFixture/FolderFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/GrantFixtures.cs b/test/Core.Test/AutoFixture/GrantFixtures.cs
index 9d6b435ab..642fb5b8f 100644
--- a/test/Core.Test/AutoFixture/GrantFixtures.cs
+++ b/test/Core.Test/AutoFixture/GrantFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/GroupFixtures.cs b/test/Core.Test/AutoFixture/GroupFixtures.cs
index d5abd759f..e322a07fc 100644
--- a/test/Core.Test/AutoFixture/GroupFixtures.cs
+++ b/test/Core.Test/AutoFixture/GroupFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/GroupUserFixtures.cs b/test/Core.Test/AutoFixture/GroupUserFixtures.cs
index a7a4063cd..79afe54e9 100644
--- a/test/Core.Test/AutoFixture/GroupUserFixtures.cs
+++ b/test/Core.Test/AutoFixture/GroupUserFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/InstallationFixtures.cs b/test/Core.Test/AutoFixture/InstallationFixtures.cs
index 7636c923a..083e651e8 100644
--- a/test/Core.Test/AutoFixture/InstallationFixtures.cs
+++ b/test/Core.Test/AutoFixture/InstallationFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/OrganizationFixtures.cs b/test/Core.Test/AutoFixture/OrganizationFixtures.cs
index a56fd42da..fcf5f554a 100644
--- a/test/Core.Test/AutoFixture/OrganizationFixtures.cs
+++ b/test/Core.Test/AutoFixture/OrganizationFixtures.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
diff --git a/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs b/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs
index 885329979..11c8cd8cb 100644
--- a/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs
+++ b/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using Bit.Core.Models.Business;
 using Bit.Test.Common.AutoFixture.Attributes;
 
diff --git a/test/Core.Test/AutoFixture/OrganizationSponsorshipFixtures.cs b/test/Core.Test/AutoFixture/OrganizationSponsorshipFixtures.cs
index b8639547e..2c4cb0d88 100644
--- a/test/Core.Test/AutoFixture/OrganizationSponsorshipFixtures.cs
+++ b/test/Core.Test/AutoFixture/OrganizationSponsorshipFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/OrganizationUserFixtures.cs b/test/Core.Test/AutoFixture/OrganizationUserFixtures.cs
index 9bebea27d..ed3766d32 100644
--- a/test/Core.Test/AutoFixture/OrganizationUserFixtures.cs
+++ b/test/Core.Test/AutoFixture/OrganizationUserFixtures.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
diff --git a/test/Core.Test/AutoFixture/PolicyFixtures.cs b/test/Core.Test/AutoFixture/PolicyFixtures.cs
index d892ed3b2..fe80b1c9d 100644
--- a/test/Core.Test/AutoFixture/PolicyFixtures.cs
+++ b/test/Core.Test/AutoFixture/PolicyFixtures.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Reflection;
-using System.Text.Json;
+using System.Reflection;
 using AutoFixture;
 using AutoFixture.Kernel;
 using AutoFixture.Xunit2;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/test/Core.Test/AutoFixture/Relays/MaxLengthStringRelay.cs b/test/Core.Test/AutoFixture/Relays/MaxLengthStringRelay.cs
index bf55cd276..68aaf5496 100644
--- a/test/Core.Test/AutoFixture/Relays/MaxLengthStringRelay.cs
+++ b/test/Core.Test/AutoFixture/Relays/MaxLengthStringRelay.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using AutoFixture.Kernel;
 
diff --git a/test/Core.Test/AutoFixture/SendFixtures.cs b/test/Core.Test/AutoFixture/SendFixtures.cs
index 00d870b25..e2fd6a0c1 100644
--- a/test/Core.Test/AutoFixture/SendFixtures.cs
+++ b/test/Core.Test/AutoFixture/SendFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/SsoConfigFixtures.cs b/test/Core.Test/AutoFixture/SsoConfigFixtures.cs
index 0a5d11564..b50884583 100644
--- a/test/Core.Test/AutoFixture/SsoConfigFixtures.cs
+++ b/test/Core.Test/AutoFixture/SsoConfigFixtures.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Text.Json;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
diff --git a/test/Core.Test/AutoFixture/TaxRateFixtures.cs b/test/Core.Test/AutoFixture/TaxRateFixtures.cs
index 1132af01e..887324a20 100644
--- a/test/Core.Test/AutoFixture/TaxRateFixtures.cs
+++ b/test/Core.Test/AutoFixture/TaxRateFixtures.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
diff --git a/test/Core.Test/AutoFixture/TransactionFixutres.cs b/test/Core.Test/AutoFixture/TransactionFixutres.cs
index 43364e462..cc91951b2 100644
--- a/test/Core.Test/AutoFixture/TransactionFixutres.cs
+++ b/test/Core.Test/AutoFixture/TransactionFixutres.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
diff --git a/test/Core.Test/AutoFixture/UserFixtures.cs b/test/Core.Test/AutoFixture/UserFixtures.cs
index 14a7ee434..99d8b2548 100644
--- a/test/Core.Test/AutoFixture/UserFixtures.cs
+++ b/test/Core.Test/AutoFixture/UserFixtures.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using AutoFixture;
+using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/test/Core.Test/Entities/OrganizationTests.cs b/test/Core.Test/Entities/OrganizationTests.cs
index e83f8f490..c24d6effc 100644
--- a/test/Core.Test/Entities/OrganizationTests.cs
+++ b/test/Core.Test/Entities/OrganizationTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/test/Core.Test/Entities/UserTests.cs b/test/Core.Test/Entities/UserTests.cs
index 39a10fff3..c60b031da 100644
--- a/test/Core.Test/Entities/UserTests.cs
+++ b/test/Core.Test/Entities/UserTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/test/Core.Test/Helpers/Factories.cs b/test/Core.Test/Helpers/Factories.cs
index 7f96bcdb7..8db0e8135 100644
--- a/test/Core.Test/Helpers/Factories.cs
+++ b/test/Core.Test/Helpers/Factories.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Test.Common.Helpers.Factories;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/test/Core.Test/Identity/AuthenticationTokenProviderTests.cs b/test/Core.Test/Identity/AuthenticationTokenProviderTests.cs
index cf8d060d0..8a5de6898 100644
--- a/test/Core.Test/Identity/AuthenticationTokenProviderTests.cs
+++ b/test/Core.Test/Identity/AuthenticationTokenProviderTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Identity;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/Core.Test/Identity/BaseTokenProviderTests.cs b/test/Core.Test/Identity/BaseTokenProviderTests.cs
index 7efcceb32..9de8abbe5 100644
--- a/test/Core.Test/Identity/BaseTokenProviderTests.cs
+++ b/test/Core.Test/Identity/BaseTokenProviderTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Services;
diff --git a/test/Core.Test/Identity/EmailTokenProviderTests.cs b/test/Core.Test/Identity/EmailTokenProviderTests.cs
index 355efe099..b1b471201 100644
--- a/test/Core.Test/Identity/EmailTokenProviderTests.cs
+++ b/test/Core.Test/Identity/EmailTokenProviderTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Identity;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/Core.Test/IdentityServer/TokenRetrievalTests.cs b/test/Core.Test/IdentityServer/TokenRetrievalTests.cs
index 0c70153f5..071f4d914 100644
--- a/test/Core.Test/IdentityServer/TokenRetrievalTests.cs
+++ b/test/Core.Test/IdentityServer/TokenRetrievalTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.IdentityServer;
+using Bit.Core.IdentityServer;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using NSubstitute;
diff --git a/test/Core.Test/Models/Business/TaxInfoTests.cs b/test/Core.Test/Models/Business/TaxInfoTests.cs
index e6d96c670..124201b62 100644
--- a/test/Core.Test/Models/Business/TaxInfoTests.cs
+++ b/test/Core.Test/Models/Business/TaxInfoTests.cs
@@ -1,5 +1,4 @@
 using Bit.Core.Models.Business;
-using NSubstitute;
 using Xunit;
 
 namespace Bit.Core.Test.Models.Business
diff --git a/test/Core.Test/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs b/test/Core.Test/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs
index e456a434e..d334c7dfa 100644
--- a/test/Core.Test/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs
+++ b/test/Core.Test/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit2;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Core.Tokens;
diff --git a/test/Core.Test/Models/Business/Tokenables/HCaptchaTokenableTests.cs b/test/Core.Test/Models/Business/Tokenables/HCaptchaTokenableTests.cs
index 8b9c8f27f..ce72fa8dc 100644
--- a/test/Core.Test/Models/Business/Tokenables/HCaptchaTokenableTests.cs
+++ b/test/Core.Test/Models/Business/Tokenables/HCaptchaTokenableTests.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit2;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Core.Tokens;
diff --git a/test/Core.Test/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenableTests.cs b/test/Core.Test/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenableTests.cs
index cb7bcd990..fd39c196b 100644
--- a/test/Core.Test/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenableTests.cs
+++ b/test/Core.Test/Models/Business/Tokenables/OrganizationSponsorshipOfferTokenableTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Core.Test/Models/Business/Tokenables/SsoTokenableTests.cs b/test/Core.Test/Models/Business/Tokenables/SsoTokenableTests.cs
index a7dee919b..aef71e5ba 100644
--- a/test/Core.Test/Models/Business/Tokenables/SsoTokenableTests.cs
+++ b/test/Core.Test/Models/Business/Tokenables/SsoTokenableTests.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit2;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Core.Tokens;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommandTests.cs
index 69530a563..e81d2bcc8 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyCommandTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
 using Bit.Core.Repositories;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs
index 03606717b..5bea4b8d2 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationCollections/CreateOrganizationConnectionCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationCollections/CreateOrganizationConnectionCommandTests.cs
index 7eecf00f1..c46a7e706 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationCollections/CreateOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationCollections/CreateOrganizationConnectionCommandTests.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
-using Bit.Core.Models.Data.Organizations.OrganizationConnections;
+using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationConnections;
 using Bit.Core.Repositories;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationCollections/DeleteOrganizationConnectionCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationCollections/DeleteOrganizationConnectionCommandTests.cs
index 0ebc48b3b..5a6690cd7 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationCollections/DeleteOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationCollections/DeleteOrganizationConnectionCommandTests.cs
@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
-using Bit.Core.Models.Data.Organizations.OrganizationConnections;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationConnections;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
-using Bit.Test.Common.Helpers;
 using NSubstitute;
 using Xunit;
 
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationCollections/UpdateOrganizationConnectionCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationCollections/UpdateOrganizationConnectionCommandTests.cs
index 6bd5e5450..dba643214 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationCollections/UpdateOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationCollections/UpdateOrganizationConnectionCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommandTestsBase.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommandTestsBase.cs
index a617ae8ab..882395721 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommandTestsBase.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommandTestsBase.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommandTests.cs
index 0e2161273..f0c7e976a 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudRevokeSponsorshipCommandTests.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommandTests.cs
index d0c2aff61..4dd9baac2 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommandTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationSponsorships;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommandTests.cs
index cf3566f3d..ca89199a4 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/OrganizationSponsorshipRenewCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommandTests.cs
index 5cdf62a73..a3ee0a7cd 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/RemoveSponsorshipCommandTests.cs
@@ -1,6 +1,4 @@
-
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommandTests.cs
index fbe9fd6eb..15377d7fe 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SendSponsorshipOfferCommandTests.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs
index 76f5b51bc..358e4f007 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommandTests.cs
index e2a2ad354..4b3426a53 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateBillingSyncKeyCommandTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommandTests.cs
index 9e474cd27..9bbaaed1d 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateRedemptionTokenCommandTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business.Tokenables;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommandTests.cs
index 78fb70264..f1beb64f3 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Repositories;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommandTests.cs
index 7df148eb9..b4e014d06 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/FamiliesForEnterpriseTestsBase.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/FamiliesForEnterpriseTestsBase.cs
index 868a5951f..862ae6e80 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/FamiliesForEnterpriseTestsBase.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/FamiliesForEnterpriseTestsBase.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Test.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommandTests.cs
index 280f8a736..6dd913383 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedRevokeSponsorshipCommandTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.SelfHosted;
 using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommandTests.cs
index 1dbf964c2..5c9741f35 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/SelfHosted/SelfHostedSyncSponsorshipsCommandTests.cs
@@ -1,10 +1,4 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using AutoFixture;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
diff --git a/test/Core.Test/Repositories/EntityFramework/CipherRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/CipherRepositoryTests.cs
index f2202e485..67d8feea5 100644
--- a/test/Core.Test/Repositories/EntityFramework/CipherRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/CipherRepositoryTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.CipherFixtures;
diff --git a/test/Core.Test/Repositories/EntityFramework/CollectionRepository.cs b/test/Core.Test/Repositories/EntityFramework/CollectionRepository.cs
index 20183951a..45e601074 100644
--- a/test/Core.Test/Repositories/EntityFramework/CollectionRepository.cs
+++ b/test/Core.Test/Repositories/EntityFramework/CollectionRepository.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.CollectionFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/DeviceRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/DeviceRepositoryTests.cs
index ac91035f8..4cdbe76ac 100644
--- a/test/Core.Test/Repositories/EntityFramework/DeviceRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/DeviceRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.DeviceFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/EmergencyAccessRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/EmergencyAccessRepositoryTests.cs
index 2b319b8d3..52a71b20f 100644
--- a/test/Core.Test/Repositories/EntityFramework/EmergencyAccessRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EmergencyAccessRepositoryTests.cs
@@ -1,13 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using AutoFixture;
-using AutoFixture.DataAnnotations;
-using AutoFixture.Kernel;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.EmergencyAccessFixtures;
-using Bit.Core.Test.AutoFixture.Relays;
-using Bit.Core.Test.AutoFixture.TransactionFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
 using Xunit;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CipherCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CipherCompare.cs
index b405d87a1..be61241d9 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CipherCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CipherCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CollectionCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CollectionCompare.cs
index aa5303e92..dd03f5dd3 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CollectionCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/CollectionCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/DeviceCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/DeviceCompare.cs
index 159ed9cdb..e5adc432c 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/DeviceCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/DeviceCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EmergencyAccessCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EmergencyAccessCompare.cs
index aaa3d799c..fb7d648e1 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EmergencyAccessCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EmergencyAccessCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EventCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EventCompare.cs
index e8add1450..635e09d28 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EventCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/EventCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/FolderCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/FolderCompare.cs
index bb9dce2b4..ffdfbf80f 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/FolderCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/FolderCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GrantCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GrantCompare.cs
index fadab5a26..677f253b1 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GrantCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GrantCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GroupCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GroupCompare.cs
index 2d48f95ba..15a72898b 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GroupCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/GroupCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/InstallationCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/InstallationCompare.cs
index 11259334c..ac7a026e3 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/InstallationCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/InstallationCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationCompare.cs
index 47346c466..7383e43e3 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationSponsorshipCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationSponsorshipCompare.cs
index 8dcb13b91..c9e142bb7 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationSponsorshipCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationSponsorshipCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationUserCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationUserCompare.cs
index 715e72907..29ddbef87 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationUserCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/OrganizationUserCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/PolicyCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/PolicyCompare.cs
index 964ca6e36..87d847f5d 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/PolicyCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/PolicyCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SendCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SendCompare.cs
index ca97abcf6..98bc58253 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SendCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SendCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoConfigCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoConfigCompare.cs
index 4d435cb33..86213134a 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoConfigCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoConfigCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoUserCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoUserCompare.cs
index d6a826949..373cbdb21 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoUserCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/SsoUserCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TaxRateCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TaxRateCompare.cs
index bcc8c1f5b..34e851459 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TaxRateCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TaxRateCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TransactionCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TransactionCompare.cs
index 36df5f80f..d5ce5dd91 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TransactionCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/TransactionCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserCompare.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserCompare.cs
index 77fe57887..a7c88161e 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserCompare.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserCompare.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Entities;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserKdfInformation.cs b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserKdfInformation.cs
index f8d0c8acc..34b3e7e9c 100644
--- a/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserKdfInformation.cs
+++ b/test/Core.Test/Repositories/EntityFramework/EqualityComparers/UserKdfInformation.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Test.Repositories.EntityFramework.EqualityComparers
diff --git a/test/Core.Test/Repositories/EntityFramework/FolderRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/FolderRepositoryTests.cs
index 8941683be..772ff495e 100644
--- a/test/Core.Test/Repositories/EntityFramework/FolderRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/FolderRepositoryTests.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.FolderFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
-using Microsoft.EntityFrameworkCore;
 using Xunit;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
 using SqlRepo = Bit.Infrastructure.Dapper.Repositories;
diff --git a/test/Core.Test/Repositories/EntityFramework/InstallationRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/InstallationRepositoryTests.cs
index 2bf26d5f1..b7579226e 100644
--- a/test/Core.Test/Repositories/EntityFramework/InstallationRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/InstallationRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.InstallationFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/OrganizationRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/OrganizationRepositoryTests.cs
index 585645c17..1151db6ac 100644
--- a/test/Core.Test/Repositories/EntityFramework/OrganizationRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/OrganizationRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Models.Data.Organizations;
+using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/OrganizationSponsorshipRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/OrganizationSponsorshipRepositoryTests.cs
index 61a7e5a0e..056c2b330 100644
--- a/test/Core.Test/Repositories/EntityFramework/OrganizationSponsorshipRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/OrganizationSponsorshipRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/OrganizationUserRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/OrganizationUserRepositoryTests.cs
index 9d627479d..910d99de2 100644
--- a/test/Core.Test/Repositories/EntityFramework/OrganizationUserRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/OrganizationUserRepositoryTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
-using Bit.Core.Models.Data;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/PolicyRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/PolicyRepositoryTests.cs
index b450a26bc..57265a944 100644
--- a/test/Core.Test/Repositories/EntityFramework/PolicyRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/PolicyRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/test/Core.Test/Repositories/EntityFramework/SendRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/SendRepositoryTests.cs
index 5145e002f..6871bf549 100644
--- a/test/Core.Test/Repositories/EntityFramework/SendRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/SendRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.SendFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/SsoConfigRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/SsoConfigRepositoryTests.cs
index bb908b53f..245f617c8 100644
--- a/test/Core.Test/Repositories/EntityFramework/SsoConfigRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/SsoConfigRepositoryTests.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
-using Bit.Core.Test.AutoFixture;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.SsoConfigFixtures;
-using Bit.Core.Test.Helpers.Factories;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
 using Xunit;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/test/Core.Test/Repositories/EntityFramework/SsoUserRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/SsoUserRepositoryTests.cs
index 6dd0eaa18..b4f4e53c1 100644
--- a/test/Core.Test/Repositories/EntityFramework/SsoUserRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/SsoUserRepositoryTests.cs
@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
-using Bit.Core.Test.AutoFixture;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.SsoUserFixtures;
-using Bit.Core.Test.Helpers.Factories;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
 using Xunit;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/test/Core.Test/Repositories/EntityFramework/TaxRateRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/TaxRateRepositoryTests.cs
index 844f2048b..906947abd 100644
--- a/test/Core.Test/Repositories/EntityFramework/TaxRateRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/TaxRateRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.TaxRateFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/TransactionRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/TransactionRepositoryTests.cs
index cafd6c87d..6d8a4544b 100644
--- a/test/Core.Test/Repositories/EntityFramework/TransactionRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/TransactionRepositoryTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.TransactionFixtures;
 using Bit.Core.Test.Repositories.EntityFramework.EqualityComparers;
diff --git a/test/Core.Test/Repositories/EntityFramework/UserRepositoryTests.cs b/test/Core.Test/Repositories/EntityFramework/UserRepositoryTests.cs
index 8ae9c2484..55138f71f 100644
--- a/test/Core.Test/Repositories/EntityFramework/UserRepositoryTests.cs
+++ b/test/Core.Test/Repositories/EntityFramework/UserRepositoryTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.UserFixtures;
diff --git a/test/Core.Test/Resources/VerifyResources.cs b/test/Core.Test/Resources/VerifyResources.cs
index 898b0f196..821eb87e2 100644
--- a/test/Core.Test/Resources/VerifyResources.cs
+++ b/test/Core.Test/Resources/VerifyResources.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Xunit;
 
 namespace Bit.Core.Test.Resources
diff --git a/test/Core.Test/Services/AmazonSesMailDeliveryServiceTests.cs b/test/Core.Test/Services/AmazonSesMailDeliveryServiceTests.cs
index c2974b6f8..6c07c897d 100644
--- a/test/Core.Test/Services/AmazonSesMailDeliveryServiceTests.cs
+++ b/test/Core.Test/Services/AmazonSesMailDeliveryServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Amazon.SimpleEmail;
+using Amazon.SimpleEmail;
 using Amazon.SimpleEmail.Model;
 using Bit.Core.Models.Mail;
 using Bit.Core.Services;
diff --git a/test/Core.Test/Services/AmazonSqsBlockIpServiceTests.cs b/test/Core.Test/Services/AmazonSqsBlockIpServiceTests.cs
index fab9b2fda..cf24d6293 100644
--- a/test/Core.Test/Services/AmazonSqsBlockIpServiceTests.cs
+++ b/test/Core.Test/Services/AmazonSqsBlockIpServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Amazon.SQS;
+using Amazon.SQS;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using NSubstitute;
diff --git a/test/Core.Test/Services/AppleIapServiceTests.cs b/test/Core.Test/Services/AppleIapServiceTests.cs
index 74f7e3fe0..ff14e52e8 100644
--- a/test/Core.Test/Services/AppleIapServiceTests.cs
+++ b/test/Core.Test/Services/AppleIapServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Microsoft.Extensions.Logging;
diff --git a/test/Core.Test/Services/AzureAttachmentStorageServiceTests.cs b/test/Core.Test/Services/AzureAttachmentStorageServiceTests.cs
index aeb505955..75cda61aa 100644
--- a/test/Core.Test/Services/AzureAttachmentStorageServiceTests.cs
+++ b/test/Core.Test/Services/AzureAttachmentStorageServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
diff --git a/test/Core.Test/Services/AzureQueueBlockIpServiceTests.cs b/test/Core.Test/Services/AzureQueueBlockIpServiceTests.cs
index 295a77adf..e4ad8bab9 100644
--- a/test/Core.Test/Services/AzureQueueBlockIpServiceTests.cs
+++ b/test/Core.Test/Services/AzureQueueBlockIpServiceTests.cs
@@ -1,7 +1,5 @@
-using System;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
-using NSubstitute;
 using Xunit;
 
 namespace Bit.Core.Test.Services
diff --git a/test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs b/test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs
index a155ad881..ce44b5f30 100644
--- a/test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs
+++ b/test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using NSubstitute;
diff --git a/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs b/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs
index 62fca9f1d..abb6ad31a 100644
--- a/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs
+++ b/test/Core.Test/Services/AzureQueuePushNotificationServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
diff --git a/test/Core.Test/Services/CipherServiceTests.cs b/test/Core.Test/Services/CipherServiceTests.cs
index 60513cec1..1e3444481 100644
--- a/test/Core.Test/Services/CipherServiceTests.cs
+++ b/test/Core.Test/Services/CipherServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
diff --git a/test/Core.Test/Services/CollectionServiceTests.cs b/test/Core.Test/Services/CollectionServiceTests.cs
index b2bb27ee9..cf4228b3f 100644
--- a/test/Core.Test/Services/CollectionServiceTests.cs
+++ b/test/Core.Test/Services/CollectionServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
diff --git a/test/Core.Test/Services/DeviceServiceTests.cs b/test/Core.Test/Services/DeviceServiceTests.cs
index bf5766f43..f3a50d4d0 100644
--- a/test/Core.Test/Services/DeviceServiceTests.cs
+++ b/test/Core.Test/Services/DeviceServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
diff --git a/test/Core.Test/Services/EmergencyAccessServiceTests.cs b/test/Core.Test/Services/EmergencyAccessServiceTests.cs
index 8086845b6..bdbb6953b 100644
--- a/test/Core.Test/Services/EmergencyAccessServiceTests.cs
+++ b/test/Core.Test/Services/EmergencyAccessServiceTests.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Test.AutoFixture;
-using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
diff --git a/test/Core.Test/Services/EventServiceTests.cs b/test/Core.Test/Services/EventServiceTests.cs
index f332fd28d..d8e09d4f0 100644
--- a/test/Core.Test/Services/EventServiceTests.cs
+++ b/test/Core.Test/Services/EventServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Context;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
diff --git a/test/Core.Test/Services/GroupServiceTests.cs b/test/Core.Test/Services/GroupServiceTests.cs
index c4cbfc7d5..84f11cbb1 100644
--- a/test/Core.Test/Services/GroupServiceTests.cs
+++ b/test/Core.Test/Services/GroupServiceTests.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Test.AutoFixture;
-using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Core.Test.AutoFixture.GroupFixtures;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Core.Test/Services/HandlebarsMailServiceTests.cs b/test/Core.Test/Services/HandlebarsMailServiceTests.cs
index cd8a49f93..c58ba2a95 100644
--- a/test/Core.Test/Services/HandlebarsMailServiceTests.cs
+++ b/test/Core.Test/Services/HandlebarsMailServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
+using System.Reflection;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Business;
diff --git a/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs b/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs
index 042fe40dc..8deae6364 100644
--- a/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs
+++ b/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using NSubstitute;
 using Xunit;
diff --git a/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs b/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs
index 0cfbe47d2..33f23ea18 100644
--- a/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs
+++ b/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using NSubstitute;
diff --git a/test/Core.Test/Services/LicensingServiceTests.cs b/test/Core.Test/Services/LicensingServiceTests.cs
index d4aa54b15..2e94ef2b5 100644
--- a/test/Core.Test/Services/LicensingServiceTests.cs
+++ b/test/Core.Test/Services/LicensingServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using AutoFixture;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
diff --git a/test/Core.Test/Services/LocalAttachmentStorageServiceTests.cs b/test/Core.Test/Services/LocalAttachmentStorageServiceTests.cs
index 988f17e85..63a3e8bc8 100644
--- a/test/Core.Test/Services/LocalAttachmentStorageServiceTests.cs
+++ b/test/Core.Test/Services/LocalAttachmentStorageServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using AutoFixture;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
diff --git a/test/Core.Test/Services/MailKitSmtpMailDeliveryServiceTests.cs b/test/Core.Test/Services/MailKitSmtpMailDeliveryServiceTests.cs
index 7a99a4b53..d4c5208a2 100644
--- a/test/Core.Test/Services/MailKitSmtpMailDeliveryServiceTests.cs
+++ b/test/Core.Test/Services/MailKitSmtpMailDeliveryServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
diff --git a/test/Core.Test/Services/MultiServicePushNotificationServiceTests.cs b/test/Core.Test/Services/MultiServicePushNotificationServiceTests.cs
index 9190fb5b0..925456619 100644
--- a/test/Core.Test/Services/MultiServicePushNotificationServiceTests.cs
+++ b/test/Core.Test/Services/MultiServicePushNotificationServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Http;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Core.Test/Services/NotificationHubPushNotificationServiceTests.cs b/test/Core.Test/Services/NotificationHubPushNotificationServiceTests.cs
index 969f23b61..ea59da3ed 100644
--- a/test/Core.Test/Services/NotificationHubPushNotificationServiceTests.cs
+++ b/test/Core.Test/Services/NotificationHubPushNotificationServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs b/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
index b8c847e27..432a79686 100644
--- a/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
+++ b/test/Core.Test/Services/NotificationHubPushRegistrationServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using NSubstitute;
diff --git a/test/Core.Test/Services/NotificationsApiPushNotificationServiceTests.cs b/test/Core.Test/Services/NotificationsApiPushNotificationServiceTests.cs
index f014dddcc..59976f57d 100644
--- a/test/Core.Test/Services/NotificationsApiPushNotificationServiceTests.cs
+++ b/test/Core.Test/Services/NotificationsApiPushNotificationServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Http;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs
index d1a28ddbc..a4f978c3d 100644
--- a/test/Core.Test/Services/OrganizationServiceTests.cs
+++ b/test/Core.Test/Services/OrganizationServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/test/Core.Test/Services/PolicyServiceTests.cs b/test/Core.Test/Services/PolicyServiceTests.cs
index 89d5ab2d3..8f99b816c 100644
--- a/test/Core.Test/Services/PolicyServiceTests.cs
+++ b/test/Core.Test/Services/PolicyServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
diff --git a/test/Core.Test/Services/RelayPushNotificationServiceTests.cs b/test/Core.Test/Services/RelayPushNotificationServiceTests.cs
index e58c851ac..68b8633e2 100644
--- a/test/Core.Test/Services/RelayPushNotificationServiceTests.cs
+++ b/test/Core.Test/Services/RelayPushNotificationServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Http;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Core.Test/Services/RelayPushRegistrationServiceTests.cs b/test/Core.Test/Services/RelayPushRegistrationServiceTests.cs
index d15db090c..371d50168 100644
--- a/test/Core.Test/Services/RelayPushRegistrationServiceTests.cs
+++ b/test/Core.Test/Services/RelayPushRegistrationServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Http;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
diff --git a/test/Core.Test/Services/RepositoryEventWriteServiceTests.cs b/test/Core.Test/Services/RepositoryEventWriteServiceTests.cs
index c82e02569..4ee3460ab 100644
--- a/test/Core.Test/Services/RepositoryEventWriteServiceTests.cs
+++ b/test/Core.Test/Services/RepositoryEventWriteServiceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using NSubstitute;
 using Xunit;
diff --git a/test/Core.Test/Services/SendGridMailDeliveryServiceTests.cs b/test/Core.Test/Services/SendGridMailDeliveryServiceTests.cs
index db2358868..8366cc266 100644
--- a/test/Core.Test/Services/SendGridMailDeliveryServiceTests.cs
+++ b/test/Core.Test/Services/SendGridMailDeliveryServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Models.Mail;
+using Bit.Core.Models.Mail;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
diff --git a/test/Core.Test/Services/SendServiceTests.cs b/test/Core.Test/Services/SendServiceTests.cs
index ccb6ccbaa..aed7d2f04 100644
--- a/test/Core.Test/Services/SendServiceTests.cs
+++ b/test/Core.Test/Services/SendServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.Text;
 using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/test/Core.Test/Services/SsoConfigServiceTests.cs b/test/Core.Test/Services/SsoConfigServiceTests.cs
index a159b10ff..475a2a1c5 100644
--- a/test/Core.Test/Services/SsoConfigServiceTests.cs
+++ b/test/Core.Test/Services/SsoConfigServiceTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/test/Core.Test/Services/StripePaymentServiceTests.cs b/test/Core.Test/Services/StripePaymentServiceTests.cs
index 398674b5c..0c4ea5c03 100644
--- a/test/Core.Test/Services/StripePaymentServiceTests.cs
+++ b/test/Core.Test/Services/StripePaymentServiceTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
diff --git a/test/Core.Test/Services/UserServiceTests.cs b/test/Core.Test/Services/UserServiceTests.cs
index 6e4c33b3f..10a4beac5 100644
--- a/test/Core.Test/Services/UserServiceTests.cs
+++ b/test/Core.Test/Services/UserServiceTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
diff --git a/test/Core.Test/TempDirectory.cs b/test/Core.Test/TempDirectory.cs
index 61ae6f8d1..9a1cd86af 100644
--- a/test/Core.Test/TempDirectory.cs
+++ b/test/Core.Test/TempDirectory.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Bit.Core.Test
+namespace Bit.Core.Test
 {
     public class TempDirectory : IDisposable
     {
diff --git a/test/Core.Test/Tokens/ExpiringTokenTests.cs b/test/Core.Test/Tokens/ExpiringTokenTests.cs
index b70f6b33b..33ce91178 100644
--- a/test/Core.Test/Tokens/ExpiringTokenTests.cs
+++ b/test/Core.Test/Tokens/ExpiringTokenTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using AutoFixture.Xunit2;
 using Bit.Core.Utilities;
 using Xunit;
diff --git a/test/Core.Test/Utilities/ClaimsExtensionsTests.cs b/test/Core.Test/Utilities/ClaimsExtensionsTests.cs
index bb888f253..d6b5c90db 100644
--- a/test/Core.Test/Utilities/ClaimsExtensionsTests.cs
+++ b/test/Core.Test/Utilities/ClaimsExtensionsTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
+using System.Security.Claims;
 using Bit.Core.Utilities;
 using Xunit;
 
diff --git a/test/Core.Test/Utilities/CoreHelpersTests.cs b/test/Core.Test/Utilities/CoreHelpersTests.cs
index a3a56bafc..29146b15d 100644
--- a/test/Core.Test/Utilities/CoreHelpersTests.cs
+++ b/test/Core.Test/Utilities/CoreHelpersTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
+using System.Text;
 using AutoFixture;
 using Bit.Core.Context;
 using Bit.Core.Entities;
@@ -15,8 +11,6 @@ using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using IdentityModel;
 using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.WebUtilities;
-using NSubstitute;
 using Xunit;
 
 namespace Bit.Core.Test.Utilities
diff --git a/test/Core.Test/Utilities/PermissiveStringConverterTests.cs b/test/Core.Test/Utilities/PermissiveStringConverterTests.cs
index 36945bbd1..523ae81d9 100644
--- a/test/Core.Test/Utilities/PermissiveStringConverterTests.cs
+++ b/test/Core.Test/Utilities/PermissiveStringConverterTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Bit.Core.Utilities;
 using Bit.Test.Common.Helpers;
diff --git a/test/Core.Test/Utilities/SelfHostedAttributeTests.cs b/test/Core.Test/Utilities/SelfHostedAttributeTests.cs
index c64794b82..4261cf7f5 100644
--- a/test/Core.Test/Utilities/SelfHostedAttributeTests.cs
+++ b/test/Core.Test/Utilities/SelfHostedAttributeTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Exceptions;
+using Bit.Core.Exceptions;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Core.Test/Utilities/StrictEmailAddressListAttributeTests.cs b/test/Core.Test/Utilities/StrictEmailAddressListAttributeTests.cs
index 2280fbb6c..2f31a75dc 100644
--- a/test/Core.Test/Utilities/StrictEmailAddressListAttributeTests.cs
+++ b/test/Core.Test/Utilities/StrictEmailAddressListAttributeTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Xunit;
 
 namespace Bit.Core.Test.Utilities
diff --git a/test/Icons.Test/Resources/VerifyResources.cs b/test/Icons.Test/Resources/VerifyResources.cs
index d8265d940..ad5d8d681 100644
--- a/test/Icons.Test/Resources/VerifyResources.cs
+++ b/test/Icons.Test/Resources/VerifyResources.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using Xunit;
+using Xunit;
 
 namespace Bit.Icons.Test.Resources
 {
diff --git a/test/Icons.Test/Services/IconFetchingServiceTests.cs b/test/Icons.Test/Services/IconFetchingServiceTests.cs
index 94eb5a2d2..ed317fb62 100644
--- a/test/Icons.Test/Services/IconFetchingServiceTests.cs
+++ b/test/Icons.Test/Services/IconFetchingServiceTests.cs
@@ -1,8 +1,6 @@
-using System.Threading.Tasks;
-using Bit.Icons.Services;
+using Bit.Icons.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
 namespace Bit.Icons.Test.Services
diff --git a/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs b/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs
index 6f1077f42..31cab0e3c 100644
--- a/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs
+++ b/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs
@@ -1,7 +1,5 @@
-using System.Threading.Tasks;
-using Bit.Core.Models.Api.Request.Accounts;
+using Bit.Core.Models.Api.Request.Accounts;
 using Bit.IntegrationTestCommon.Factories;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
index 364624c02..b28f3374b 100644
--- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
+++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
@@ -1,21 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Repositories;
-using Bit.Core.Utilities;
 using Bit.IntegrationTestCommon.Factories;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Bit.Test.Common.Helpers;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
 namespace Bit.Identity.IntegrationTest.Endpoints
diff --git a/test/Identity.Test/Controllers/AccountsControllerTests.cs b/test/Identity.Test/Controllers/AccountsControllerTests.cs
index 042651518..6fa8f493c 100644
--- a/test/Identity.Test/Controllers/AccountsControllerTests.cs
+++ b/test/Identity.Test/Controllers/AccountsControllerTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.Core.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Request.Accounts;
diff --git a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs
index db8f77a32..0a8741b55 100644
--- a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs
+++ b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs
@@ -1,8 +1,5 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Json;
+using System.Net.Http.Json;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Utilities;
diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
index 8318fc672..dcc12728a 100644
--- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
+++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using AspNetCoreRateLimit;
+using AspNetCoreRateLimit;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryExtensions.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryExtensions.cs
index 9a4430f98..ed428a772 100644
--- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryExtensions.cs
+++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
+using System.Net;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
diff --git a/util/Migrator/DbMigrator.cs b/util/Migrator/DbMigrator.cs
index adfef0e6a..d0463a00e 100644
--- a/util/Migrator/DbMigrator.cs
+++ b/util/Migrator/DbMigrator.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Data;
+using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using System.Threading;
 using Bit.Core;
 using DbUp;
 using Microsoft.Extensions.Logging;
diff --git a/util/MySqlMigrations/Factories.cs b/util/MySqlMigrations/Factories.cs
index a47875019..734b88dd8 100644
--- a/util/MySqlMigrations/Factories.cs
+++ b/util/MySqlMigrations/Factories.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
diff --git a/util/MySqlMigrations/Migrations/20210617183900_Init.cs b/util/MySqlMigrations/Migrations/20210617183900_Init.cs
index 2da6edc44..859091b72 100644
--- a/util/MySqlMigrations/Migrations/20210617183900_Init.cs
+++ b/util/MySqlMigrations/Migrations/20210617183900_Init.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
diff --git a/util/MySqlMigrations/Migrations/20210709095522_RemoveProviderOrganizationProviderUser.cs b/util/MySqlMigrations/Migrations/20210709095522_RemoveProviderOrganizationProviderUser.cs
index 0fcbe231c..cf28c6fce 100644
--- a/util/MySqlMigrations/Migrations/20210709095522_RemoveProviderOrganizationProviderUser.cs
+++ b/util/MySqlMigrations/Migrations/20210709095522_RemoveProviderOrganizationProviderUser.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20210921132418_AddMaxAutoscaleSeatsToOrganization.cs b/util/MySqlMigrations/Migrations/20210921132418_AddMaxAutoscaleSeatsToOrganization.cs
index 54018634f..2ae51dc4a 100644
--- a/util/MySqlMigrations/Migrations/20210921132418_AddMaxAutoscaleSeatsToOrganization.cs
+++ b/util/MySqlMigrations/Migrations/20210921132418_AddMaxAutoscaleSeatsToOrganization.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs b/util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs
index 00029efb8..8884d3340 100644
--- a/util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs
+++ b/util/MySqlMigrations/Migrations/20211011144835_SplitManageCollectionsPermissions2.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
diff --git a/util/MySqlMigrations/Migrations/20211021201150_SetMaxAutoscaleSeatsToCurrentSeatCount.cs b/util/MySqlMigrations/Migrations/20211021201150_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
index fba4fc4f7..af746bccc 100644
--- a/util/MySqlMigrations/Migrations/20211021201150_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
+++ b/util/MySqlMigrations/Migrations/20211021201150_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
diff --git a/util/MySqlMigrations/Migrations/20211108225243_OrganizationSponsorship.cs b/util/MySqlMigrations/Migrations/20211108225243_OrganizationSponsorship.cs
index ae63c2958..68dc13557 100644
--- a/util/MySqlMigrations/Migrations/20211108225243_OrganizationSponsorship.cs
+++ b/util/MySqlMigrations/Migrations/20211108225243_OrganizationSponsorship.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20220121092546_RemoveU2F.cs b/util/MySqlMigrations/Migrations/20220121092546_RemoveU2F.cs
index e937b332c..8d9250fee 100644
--- a/util/MySqlMigrations/Migrations/20220121092546_RemoveU2F.cs
+++ b/util/MySqlMigrations/Migrations/20220121092546_RemoveU2F.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
diff --git a/util/MySqlMigrations/Migrations/20220301215315_FailedLoginCaptcha.cs b/util/MySqlMigrations/Migrations/20220301215315_FailedLoginCaptcha.cs
index 4a36b09fd..f7c8bcc57 100644
--- a/util/MySqlMigrations/Migrations/20220301215315_FailedLoginCaptcha.cs
+++ b/util/MySqlMigrations/Migrations/20220301215315_FailedLoginCaptcha.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20220322191314_SelfHostF4E.cs b/util/MySqlMigrations/Migrations/20220322191314_SelfHostF4E.cs
index b3d12c752..c6f9c8934 100644
--- a/util/MySqlMigrations/Migrations/20220322191314_SelfHostF4E.cs
+++ b/util/MySqlMigrations/Migrations/20220322191314_SelfHostF4E.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20220411191518_SponsorshipBulkActions.cs b/util/MySqlMigrations/Migrations/20220411191518_SponsorshipBulkActions.cs
index b1b41f4a5..30e31e015 100644
--- a/util/MySqlMigrations/Migrations/20220411191518_SponsorshipBulkActions.cs
+++ b/util/MySqlMigrations/Migrations/20220411191518_SponsorshipBulkActions.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/MySqlMigrations/Migrations/20220420170738_AddInstallationIdToEvents.cs b/util/MySqlMigrations/Migrations/20220420170738_AddInstallationIdToEvents.cs
index 650a919e8..77b3b5a69 100644
--- a/util/MySqlMigrations/Migrations/20220420170738_AddInstallationIdToEvents.cs
+++ b/util/MySqlMigrations/Migrations/20220420170738_AddInstallationIdToEvents.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.MySqlMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Factories.cs b/util/PostgresMigrations/Factories.cs
index 98a6ebea7..532dddf73 100644
--- a/util/PostgresMigrations/Factories.cs
+++ b/util/PostgresMigrations/Factories.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Bit.Core.Enums;
-using Bit.Core.Settings;
+using Bit.Core.Settings;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
diff --git a/util/PostgresMigrations/Migrations/20210708191531_Init.cs b/util/PostgresMigrations/Migrations/20210708191531_Init.cs
index 7eaa32a5a..3de407ff2 100644
--- a/util/PostgresMigrations/Migrations/20210708191531_Init.cs
+++ b/util/PostgresMigrations/Migrations/20210708191531_Init.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace Bit.PostgresMigrations.Migrations
diff --git a/util/PostgresMigrations/Migrations/20210709092227_RemoveProviderOrganizationProviderUser.cs b/util/PostgresMigrations/Migrations/20210709092227_RemoveProviderOrganizationProviderUser.cs
index f094fdbd0..ba7da780f 100644
--- a/util/PostgresMigrations/Migrations/20210709092227_RemoveProviderOrganizationProviderUser.cs
+++ b/util/PostgresMigrations/Migrations/20210709092227_RemoveProviderOrganizationProviderUser.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20210920201829_AddMaxAutoscaleSeatsToOrganization.cs b/util/PostgresMigrations/Migrations/20210920201829_AddMaxAutoscaleSeatsToOrganization.cs
index 33ad21e14..98d2acce6 100644
--- a/util/PostgresMigrations/Migrations/20210920201829_AddMaxAutoscaleSeatsToOrganization.cs
+++ b/util/PostgresMigrations/Migrations/20210920201829_AddMaxAutoscaleSeatsToOrganization.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs b/util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
index 67796b5e4..90b0884ab 100644
--- a/util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
+++ b/util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
diff --git a/util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs b/util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
index 4730b2b7e..c8c569a0d 100644
--- a/util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
+++ b/util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
@@ -1,5 +1,4 @@
-using System;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
diff --git a/util/PostgresMigrations/Migrations/20211108225011_OrganizationSponsorship.cs b/util/PostgresMigrations/Migrations/20211108225011_OrganizationSponsorship.cs
index 162792a6e..6918e885d 100644
--- a/util/PostgresMigrations/Migrations/20211108225011_OrganizationSponsorship.cs
+++ b/util/PostgresMigrations/Migrations/20211108225011_OrganizationSponsorship.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20220121092321_RemoveU2F.cs b/util/PostgresMigrations/Migrations/20220121092321_RemoveU2F.cs
index caca2da9c..906c30be4 100644
--- a/util/PostgresMigrations/Migrations/20220121092321_RemoveU2F.cs
+++ b/util/PostgresMigrations/Migrations/20220121092321_RemoveU2F.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace Bit.PostgresMigrations.Migrations
diff --git a/util/PostgresMigrations/Migrations/20220301211818_FailedLoginCaptcha.cs b/util/PostgresMigrations/Migrations/20220301211818_FailedLoginCaptcha.cs
index a67e22214..6c57172fb 100644
--- a/util/PostgresMigrations/Migrations/20220301211818_FailedLoginCaptcha.cs
+++ b/util/PostgresMigrations/Migrations/20220301211818_FailedLoginCaptcha.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20220322183505_SelfHostF4E.cs b/util/PostgresMigrations/Migrations/20220322183505_SelfHostF4E.cs
index 0965bb340..b636101b0 100644
--- a/util/PostgresMigrations/Migrations/20220322183505_SelfHostF4E.cs
+++ b/util/PostgresMigrations/Migrations/20220322183505_SelfHostF4E.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20220411190525_SponsorshipBulkActions.cs b/util/PostgresMigrations/Migrations/20220411190525_SponsorshipBulkActions.cs
index 027a1ae5f..46b76b2bf 100644
--- a/util/PostgresMigrations/Migrations/20220411190525_SponsorshipBulkActions.cs
+++ b/util/PostgresMigrations/Migrations/20220411190525_SponsorshipBulkActions.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/PostgresMigrations/Migrations/20220420171153_AddInstallationIdToEvents.cs b/util/PostgresMigrations/Migrations/20220420171153_AddInstallationIdToEvents.cs
index c9226d37a..94bfa5b7c 100644
--- a/util/PostgresMigrations/Migrations/20220420171153_AddInstallationIdToEvents.cs
+++ b/util/PostgresMigrations/Migrations/20220420171153_AddInstallationIdToEvents.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Bit.PostgresMigrations.Migrations
 {
diff --git a/util/Server/Program.cs b/util/Server/Program.cs
index 61eaab7a7..25f5fd440 100644
--- a/util/Server/Program.cs
+++ b/util/Server/Program.cs
@@ -1,9 +1,4 @@
-using System.IO;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Bit.Server
+namespace Bit.Server
 {
     public class Program
     {
diff --git a/util/Server/Startup.cs b/util/Server/Startup.cs
index 4c328e12c..362d87383 100644
--- a/util/Server/Startup.cs
+++ b/util/Server/Startup.cs
@@ -1,11 +1,5 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using System.Globalization;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Server
 {
diff --git a/util/Setup/AppIdBuilder.cs b/util/Setup/AppIdBuilder.cs
index 1af775f45..46fe222b6 100644
--- a/util/Setup/AppIdBuilder.cs
+++ b/util/Setup/AppIdBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Bit.Setup
+namespace Bit.Setup
 {
     public class AppIdBuilder
     {
diff --git a/util/Setup/CertBuilder.cs b/util/Setup/CertBuilder.cs
index 143840e01..3a43888f2 100644
--- a/util/Setup/CertBuilder.cs
+++ b/util/Setup/CertBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Bit.Setup
+namespace Bit.Setup
 {
     public class CertBuilder
     {
diff --git a/util/Setup/Configuration.cs b/util/Setup/Configuration.cs
index d54d3162b..6c030cdd5 100644
--- a/util/Setup/Configuration.cs
+++ b/util/Setup/Configuration.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using YamlDotNet.Serialization;
 
 namespace Bit.Setup
diff --git a/util/Setup/Context.cs b/util/Setup/Context.cs
index 88be335a3..cf8efa90e 100644
--- a/util/Setup/Context.cs
+++ b/util/Setup/Context.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using YamlDotNet.Serialization;
+using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace Bit.Setup
diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index 8597b7ba3..29dff8065 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Bit.Setup
+namespace Bit.Setup
 {
     public class DockerComposeBuilder
     {
diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
index ae27746d4..77a94bd06 100644
--- a/util/Setup/EnvironmentFileBuilder.cs
+++ b/util/Setup/EnvironmentFileBuilder.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.IO;
-using System.Linq;
+using System.Data.SqlClient;
 
 namespace Bit.Setup
 {
diff --git a/util/Setup/Helpers.cs b/util/Setup/Helpers.cs
index 9918ed08a..06c48f2fe 100644
--- a/util/Setup/Helpers.cs
+++ b/util/Setup/Helpers.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
+using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
diff --git a/util/Setup/NginxConfigBuilder.cs b/util/Setup/NginxConfigBuilder.cs
index 07ec52a58..c9c0c2623 100644
--- a/util/Setup/NginxConfigBuilder.cs
+++ b/util/Setup/NginxConfigBuilder.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-
-namespace Bit.Setup
+namespace Bit.Setup
 {
     public class NginxConfigBuilder
     {
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index 776f67234..8eb6474fd 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
+using System.Data.SqlClient;
 using System.Globalization;
-using System.Net.Http;
 using System.Net.Http.Json;
 using Bit.Migrator;
 
diff --git a/util/Setup/YamlComments.cs b/util/Setup/YamlComments.cs
index a4630f4c4..32b935d50 100644
--- a/util/Setup/YamlComments.cs
+++ b/util/Setup/YamlComments.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
+using System.ComponentModel;
 using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;