diff --git a/CaddyManager.Contracts/Caddy/ICaddyService.cs b/CaddyManager.Contracts/Caddy/ICaddyService.cs
index 2a45813..3d1786a 100644
--- a/CaddyManager.Contracts/Caddy/ICaddyService.cs
+++ b/CaddyManager.Contracts/Caddy/ICaddyService.cs
@@ -1,9 +1,6 @@
-using CaddyManager.Contracts.Models.Caddy;
-using CaddyManager.Contracts.Configurations.Caddy;
-
 namespace CaddyManager.Contracts.Caddy;
+
 using CaddyManager.Contracts.Models.Caddy;
-using CaddyManager.Contracts.Configurations.Caddy;
 
 /// <summary>
 /// Contracts for Caddy Service to help monitor the available Caddy configurations
diff --git a/CaddyManager.Contracts/Configurations/IConfigurationsService.cs b/CaddyManager.Contracts/Configurations/IConfigurationsService.cs
index 29a3f63..c2961fd 100644
--- a/CaddyManager.Contracts/Configurations/IConfigurationsService.cs
+++ b/CaddyManager.Contracts/Configurations/IConfigurationsService.cs
@@ -1,6 +1,3 @@
-using CaddyManager.Contracts.Configurations.Caddy;
-using CaddyManager.Contracts.Configurations.Docker;
-
 namespace CaddyManager.Contracts.Configurations;
 
 /// <summary>
diff --git a/CaddyManager.Services/Configurations/ConfigurationsService.cs b/CaddyManager.Services/Configurations/ConfigurationsService.cs
index 81a07a0..f3ffb9c 100644
--- a/CaddyManager.Services/Configurations/ConfigurationsService.cs
+++ b/CaddyManager.Services/Configurations/ConfigurationsService.cs
@@ -1,7 +1,5 @@
 using NetCore.AutoRegisterDi;
 using Microsoft.Extensions.Configuration;
-using CaddyManager.Contracts.Configurations.Caddy;
-using CaddyManager.Contracts.Configurations.Docker;
 using CaddyManager.Contracts.Configurations;
 
 namespace CaddyManager.Services.Configurations;
diff --git a/CaddyManager.Tests/Services/Caddy/CaddyServiceIntegrationTests.cs b/CaddyManager.Tests/Services/Caddy/CaddyServiceIntegrationTests.cs
index c01d414..e5f250a 100644
--- a/CaddyManager.Tests/Services/Caddy/CaddyServiceIntegrationTests.cs
+++ b/CaddyManager.Tests/Services/Caddy/CaddyServiceIntegrationTests.cs
@@ -1,5 +1,4 @@
 using CaddyManager.Contracts.Configurations.Caddy;
-using CaddyManager.Contracts.Caddy;
 using CaddyManager.Contracts.Configurations;
 using CaddyManager.Contracts.Models.Caddy;
 using CaddyManager.Services.Caddy;
diff --git a/CaddyManager.Tests/Services/Configurations/ConfigurationsServiceTests.cs b/CaddyManager.Tests/Services/Configurations/ConfigurationsServiceTests.cs
index d6ae000..ddc6a1b 100644
--- a/CaddyManager.Tests/Services/Configurations/ConfigurationsServiceTests.cs
+++ b/CaddyManager.Tests/Services/Configurations/ConfigurationsServiceTests.cs
@@ -2,7 +2,6 @@ using CaddyManager.Contracts.Configurations.Caddy;
 using CaddyManager.Contracts.Configurations.Docker;
 using CaddyManager.Services.Configurations;
 using CaddyManager.Tests.TestUtilities;
-using Microsoft.Extensions.Configuration;
 
 namespace CaddyManager.Tests.Services.Configurations;
 
diff --git a/CaddyManager.Tests/Services/Docker/DockerServiceTests.cs b/CaddyManager.Tests/Services/Docker/DockerServiceTests.cs
index fd414d9..fd129cb 100644
--- a/CaddyManager.Tests/Services/Docker/DockerServiceTests.cs
+++ b/CaddyManager.Tests/Services/Docker/DockerServiceTests.cs
@@ -1,9 +1,6 @@
 using CaddyManager.Contracts.Configurations.Docker;
 using CaddyManager.Contracts.Configurations;
 using CaddyManager.Services.Docker;
-using CaddyManager.Tests.TestUtilities;
-using Docker.DotNet;
-using Docker.DotNet.Models;
 
 namespace CaddyManager.Tests.Services.Docker;
 
diff --git a/CaddyManager.Tests/TestUtilities/TestHelper.cs b/CaddyManager.Tests/TestUtilities/TestHelper.cs
index 81834e1..73b3081 100644
--- a/CaddyManager.Tests/TestUtilities/TestHelper.cs
+++ b/CaddyManager.Tests/TestUtilities/TestHelper.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Configuration;
-using System.Text.Json;
 
 namespace CaddyManager.Tests.TestUtilities;
 
diff --git a/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxiesPage.razor.cs b/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxiesPage.razor.cs
index 5620201..237b0a9 100644
--- a/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxiesPage.razor.cs
+++ b/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxiesPage.razor.cs
@@ -1,7 +1,6 @@
 using CaddyManager.Contracts.Caddy;
 using System.Globalization;
 using CaddyManager.Components.Pages.Generic;
-using CaddyManager.Services.Caddy;
 using CaddyManager.Contracts.Docker;
 using CaddyManager.Contracts.Models.Caddy;
 using Humanizer;
diff --git a/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxyItem.razor.cs b/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxyItem.razor.cs
index 1508fa6..ada5e94 100644
--- a/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxyItem.razor.cs
+++ b/CaddyManager/Components/Pages/Caddy/CaddyReverseProxies/CaddyReverseProxyItem.razor.cs
@@ -1,4 +1,3 @@
-using CaddyManager.Services.Caddy;
 using CaddyManager.Contracts.Models.Caddy;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
diff --git a/CaddyManager/Components/Pages/Caddy/CaddyfileEditor/CaddyfileEditor.razor.cs b/CaddyManager/Components/Pages/Caddy/CaddyfileEditor/CaddyfileEditor.razor.cs
index cf6347f..086b5ad 100644
--- a/CaddyManager/Components/Pages/Caddy/CaddyfileEditor/CaddyfileEditor.razor.cs
+++ b/CaddyManager/Components/Pages/Caddy/CaddyfileEditor/CaddyfileEditor.razor.cs
@@ -1,6 +1,5 @@
 using CaddyManager.Contracts.Caddy;
 using BlazorMonaco.Editor;
-using CaddyManager.Services.Caddy;
 using CaddyManager.Contracts.Models.Caddy;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;