diff --git a/samples/TestFtpServer.Shell/Commands/ContinueCommandHandler.cs b/samples/TestFtpServer.Shell/Commands/ContinueCommandHandler.cs
index a38f665e..592761df 100644
--- a/samples/TestFtpServer.Shell/Commands/ContinueCommandHandler.cs
+++ b/samples/TestFtpServer.Shell/Commands/ContinueCommandHandler.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Fubar Development Junker. All rights reserved.
 // </copyright>
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/src/FubarDev.FtpServer.Abstractions/FtpServerBuilderExtensions.cs b/src/FubarDev.FtpServer.Abstractions/FtpServerBuilderExtensions.cs
index 99dc4a5e..59f4536a 100644
--- a/src/FubarDev.FtpServer.Abstractions/FtpServerBuilderExtensions.cs
+++ b/src/FubarDev.FtpServer.Abstractions/FtpServerBuilderExtensions.cs
@@ -7,7 +7,6 @@
 using FubarDev.FtpServer.AccountManagement;
 using FubarDev.FtpServer.AccountManagement.Directories.RootPerUser;
 using FubarDev.FtpServer.AccountManagement.Directories.SingleRootWithoutHome;
-using FubarDev.FtpServer.ConnectionChecks;
 using FubarDev.FtpServer.FileSystem;
 
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/FubarDev.FtpServer.FileSystem.Unix/UnixDirectoryEntry.cs b/src/FubarDev.FtpServer.FileSystem.Unix/UnixDirectoryEntry.cs
index 164c7157..9b69e20f 100644
--- a/src/FubarDev.FtpServer.FileSystem.Unix/UnixDirectoryEntry.cs
+++ b/src/FubarDev.FtpServer.FileSystem.Unix/UnixDirectoryEntry.cs
@@ -4,8 +4,6 @@
 
 using System.Security.Claims;
 
-using FubarDev.FtpServer.AccountManagement;
-
 using Mono.Unix;
 
 namespace FubarDev.FtpServer.FileSystem.Unix
diff --git a/src/FubarDev.FtpServer.FileSystem.Unix/UnixPermissionExtensions.cs b/src/FubarDev.FtpServer.FileSystem.Unix/UnixPermissionExtensions.cs
index 7a0ad72a..aca55676 100644
--- a/src/FubarDev.FtpServer.FileSystem.Unix/UnixPermissionExtensions.cs
+++ b/src/FubarDev.FtpServer.FileSystem.Unix/UnixPermissionExtensions.cs
@@ -4,7 +4,6 @@
 
 using System.Security.Claims;
 
-using FubarDev.FtpServer.AccountManagement;
 using FubarDev.FtpServer.FileSystem.Generic;
 namespace FubarDev.FtpServer.FileSystem.Unix
 {
diff --git a/src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs b/src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs
index af36e921..0d33f639 100644
--- a/src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs
+++ b/src/FubarDev.FtpServer/ConnectionHandlers/IFtpConnectionAdapter.cs
@@ -2,9 +2,6 @@
 // Copyright (c) Fubar Development Junker. All rights reserved.
 // </copyright>
 
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace FubarDev.FtpServer.ConnectionHandlers
 {
     /// <summary>
diff --git a/src/FubarDev.FtpServer/ServerCommandHandlers/CloseConnectionServerCommandHandler.cs b/src/FubarDev.FtpServer/ServerCommandHandlers/CloseConnectionServerCommandHandler.cs
index 4af630f5..5851694b 100644
--- a/src/FubarDev.FtpServer/ServerCommandHandlers/CloseConnectionServerCommandHandler.cs
+++ b/src/FubarDev.FtpServer/ServerCommandHandlers/CloseConnectionServerCommandHandler.cs
@@ -8,8 +8,6 @@
 using FubarDev.FtpServer.Features;
 using FubarDev.FtpServer.ServerCommands;
 
-using Microsoft.Extensions.DependencyInjection;
-
 namespace FubarDev.FtpServer.ServerCommandHandlers
 {
     /// <summary>