diff --git a/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj b/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj
index f65b0342..d93ed4ca 100644
--- a/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj
+++ b/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Axuno.BackgroundTask.Test/BackgroundQueueServiceConfigTests.cs b/Axuno.BackgroundTask.Test/BackgroundQueueServiceConfigTests.cs
index eb6769a9..c8fca611 100644
--- a/Axuno.BackgroundTask.Test/BackgroundQueueServiceConfigTests.cs
+++ b/Axuno.BackgroundTask.Test/BackgroundQueueServiceConfigTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axuno.BackgroundTask;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Axuno.BackgroundTask.Tests;
 
diff --git a/Axuno.BackgroundTask.Test/BackgroundQueueServiceTests.cs b/Axuno.BackgroundTask.Test/BackgroundQueueServiceTests.cs
index 6fce601d..fa9e602b 100644
--- a/Axuno.BackgroundTask.Test/BackgroundQueueServiceTests.cs
+++ b/Axuno.BackgroundTask.Test/BackgroundQueueServiceTests.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Axuno.UnitTest.TestComponents;
-using Microsoft.Extensions.Options;
 
 namespace Axuno.BackgroundTask.Tests;
 
diff --git a/Axuno.BackgroundTask.Test/BackgroundQueueTests.cs b/Axuno.BackgroundTask.Test/BackgroundQueueTests.cs
index 0b58f187..c1f7748a 100644
--- a/Axuno.BackgroundTask.Test/BackgroundQueueTests.cs
+++ b/Axuno.BackgroundTask.Test/BackgroundQueueTests.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
diff --git a/Axuno.BackgroundTask.Test/BackgroundTask.cs b/Axuno.BackgroundTask.Test/BackgroundTask.cs
index b65cc217..0802caaa 100644
--- a/Axuno.BackgroundTask.Test/BackgroundTask.cs
+++ b/Axuno.BackgroundTask.Test/BackgroundTask.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Axuno.BackgroundTask.Tests;
+namespace Axuno.BackgroundTask.Tests;
 
 public class BgTsk : IBackgroundTask
 {
diff --git a/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceConfigTests.cs b/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceConfigTests.cs
index 3706c86a..c684a9ee 100644
--- a/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceConfigTests.cs
+++ b/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceConfigTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axuno.BackgroundTask;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Axuno.BackgroundTask.Tests;
 
diff --git a/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceTests.cs b/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceTests.cs
index 5bc6bddf..468b79cf 100644
--- a/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceTests.cs
+++ b/Axuno.BackgroundTask.Test/ConcurrentBackgroundQueueServiceTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Runtime;
-using System.Threading;
-using System.Threading.Tasks;
 using Axuno.UnitTest.TestComponents;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/Axuno.BackgroundTask.Test/NUnitLogger.cs b/Axuno.BackgroundTask.Test/NUnitLogger.cs
index 6e233170..87c1e77c 100644
--- a/Axuno.BackgroundTask.Test/NUnitLogger.cs
+++ b/Axuno.BackgroundTask.Test/NUnitLogger.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 using Microsoft.Extensions.Logging;
 
diff --git a/Axuno.BackgroundTask.Test/NUnitLoggerOfT.cs b/Axuno.BackgroundTask.Test/NUnitLoggerOfT.cs
index 0e3b51dc..8a38ab0c 100644
--- a/Axuno.BackgroundTask.Test/NUnitLoggerOfT.cs
+++ b/Axuno.BackgroundTask.Test/NUnitLoggerOfT.cs
@@ -1,5 +1,4 @@
-using Axuno.UnitTest.TestComponents;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Axuno.UnitTest.TestComponents;
 
diff --git a/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj b/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj
index 8156af25..48d9b3cb 100644
--- a/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj
+++ b/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj
@@ -5,6 +5,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1591</NoWarn>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Axuno.BackgroundTask/BackgroundQueue.cs b/Axuno.BackgroundTask/BackgroundQueue.cs
index 50f8bf0f..64418568 100644
--- a/Axuno.BackgroundTask/BackgroundQueue.cs
+++ b/Axuno.BackgroundTask/BackgroundQueue.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
diff --git a/Axuno.BackgroundTask/BackgroundQueueConfig.cs b/Axuno.BackgroundTask/BackgroundQueueConfig.cs
index e954e7d5..1bbc04b1 100644
--- a/Axuno.BackgroundTask/BackgroundQueueConfig.cs
+++ b/Axuno.BackgroundTask/BackgroundQueueConfig.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 /// <summary>
 /// Contains the configuration for a <see cref="BackgroundQueue"/>.
diff --git a/Axuno.BackgroundTask/BackgroundQueueService.cs b/Axuno.BackgroundTask/BackgroundQueueService.cs
index 090a9c15..d846eaad 100644
--- a/Axuno.BackgroundTask/BackgroundQueueService.cs
+++ b/Axuno.BackgroundTask/BackgroundQueueService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
diff --git a/Axuno.BackgroundTask/BackgroundQueueServiceConfig.cs b/Axuno.BackgroundTask/BackgroundQueueServiceConfig.cs
index 965b821f..93b96ec2 100644
--- a/Axuno.BackgroundTask/BackgroundQueueServiceConfig.cs
+++ b/Axuno.BackgroundTask/BackgroundQueueServiceConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 /// <summary>
 /// Contains the configuration for a <see cref="BackgroundQueueService"/>.
diff --git a/Axuno.BackgroundTask/BackgroundQueueServiceExtensions.cs b/Axuno.BackgroundTask/BackgroundQueueServiceExtensions.cs
index 5735ac91..de4d52f7 100644
--- a/Axuno.BackgroundTask/BackgroundQueueServiceExtensions.cs
+++ b/Axuno.BackgroundTask/BackgroundQueueServiceExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Axuno.BackgroundTask;
diff --git a/Axuno.BackgroundTask/BackgroundTaskEmpty.cs b/Axuno.BackgroundTask/BackgroundTaskEmpty.cs
index ac217ec8..33014910 100644
--- a/Axuno.BackgroundTask/BackgroundTaskEmpty.cs
+++ b/Axuno.BackgroundTask/BackgroundTaskEmpty.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 /// <summary>
 /// An <see cref="IBackgroundTask"/> that does nothing.
diff --git a/Axuno.BackgroundTask/ConcurrentBackgroundQueueService.cs b/Axuno.BackgroundTask/ConcurrentBackgroundQueueService.cs
index 0b5734c9..7030f8cf 100644
--- a/Axuno.BackgroundTask/ConcurrentBackgroundQueueService.cs
+++ b/Axuno.BackgroundTask/ConcurrentBackgroundQueueService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
diff --git a/Axuno.BackgroundTask/ConcurrentBackgroundQueueServiceConfig.cs b/Axuno.BackgroundTask/ConcurrentBackgroundQueueServiceConfig.cs
index 810f49b9..f57ffb2a 100644
--- a/Axuno.BackgroundTask/ConcurrentBackgroundQueueServiceConfig.cs
+++ b/Axuno.BackgroundTask/ConcurrentBackgroundQueueServiceConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 /// <summary>
 /// Contains the configuration for a <see cref="ConcurrentBackgroundQueueService"/>.
diff --git a/Axuno.BackgroundTask/ConsumeScopedServiceHostedService.cs b/Axuno.BackgroundTask/ConsumeScopedServiceHostedService.cs
index 2e11d5ed..ff94e16b 100644
--- a/Axuno.BackgroundTask/ConsumeScopedServiceHostedService.cs
+++ b/Axuno.BackgroundTask/ConsumeScopedServiceHostedService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/Axuno.BackgroundTask/CronJobService.cs b/Axuno.BackgroundTask/CronJobService.cs
index 6f0e8b2b..6116edfd 100644
--- a/Axuno.BackgroundTask/CronJobService.cs
+++ b/Axuno.BackgroundTask/CronJobService.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
 using Cronos;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Axuno.BackgroundTask;
 
diff --git a/Axuno.BackgroundTask/CronJobServiceExtensions.cs b/Axuno.BackgroundTask/CronJobServiceExtensions.cs
index 2cb1f4bd..82bb82ab 100644
--- a/Axuno.BackgroundTask/CronJobServiceExtensions.cs
+++ b/Axuno.BackgroundTask/CronJobServiceExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axuno.BackgroundTask;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Axuno.BackgroundTask;
 
diff --git a/Axuno.BackgroundTask/IBackgroundQueue.cs b/Axuno.BackgroundTask/IBackgroundQueue.cs
index 3c338b73..d135e87a 100644
--- a/Axuno.BackgroundTask/IBackgroundQueue.cs
+++ b/Axuno.BackgroundTask/IBackgroundQueue.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 public interface IBackgroundQueue
 {
diff --git a/Axuno.BackgroundTask/IBackgroundTask.cs b/Axuno.BackgroundTask/IBackgroundTask.cs
index 421bc670..8652ed3b 100644
--- a/Axuno.BackgroundTask/IBackgroundTask.cs
+++ b/Axuno.BackgroundTask/IBackgroundTask.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Axuno.BackgroundTask;
+namespace Axuno.BackgroundTask;
 
 /// <summary>
 /// Interface for background tasks.
diff --git a/Axuno.BackgroundTask/ScopedProcessingService.cs b/Axuno.BackgroundTask/ScopedProcessingService.cs
index 610271c4..46079424 100644
--- a/Axuno.BackgroundTask/ScopedProcessingService.cs
+++ b/Axuno.BackgroundTask/ScopedProcessingService.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Axuno.BackgroundTask;
 
diff --git a/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj b/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj
index 4bc70ff6..b88fcd9a 100644
--- a/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj
+++ b/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj
@@ -5,6 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Axuno.Tools/AssemblyInfo.cs b/Axuno.Tools/AssemblyInfo.cs
index 27088c94..7447e9c9 100644
--- a/Axuno.Tools/AssemblyInfo.cs
+++ b/Axuno.Tools/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Reflection;
 
 namespace Axuno.Tools;
diff --git a/Axuno.Tools/Axuno.Tools.csproj b/Axuno.Tools/Axuno.Tools.csproj
index 6e0778d8..ca16c789 100644
--- a/Axuno.Tools/Axuno.Tools.csproj
+++ b/Axuno.Tools/Axuno.Tools.csproj
@@ -7,6 +7,7 @@
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1591</NoWarn>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Axuno.Tools/DateAndTime/IZonedTimeInfo.cs b/Axuno.Tools/DateAndTime/IZonedTimeInfo.cs
index 9995aee7..49bae040 100644
--- a/Axuno.Tools/DateAndTime/IZonedTimeInfo.cs
+++ b/Axuno.Tools/DateAndTime/IZonedTimeInfo.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.DateAndTime;
 
diff --git a/Axuno.Tools/DateAndTime/TimeZoneConverter.cs b/Axuno.Tools/DateAndTime/TimeZoneConverter.cs
index 650f5b01..120d6e89 100644
--- a/Axuno.Tools/DateAndTime/TimeZoneConverter.cs
+++ b/Axuno.Tools/DateAndTime/TimeZoneConverter.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using NodaTime;
 using NodaTime.TimeZones;
diff --git a/Axuno.Tools/DateAndTime/ZonedTime.cs b/Axuno.Tools/DateAndTime/ZonedTime.cs
index 7efe8510..cc803ef5 100644
--- a/Axuno.Tools/DateAndTime/ZonedTime.cs
+++ b/Axuno.Tools/DateAndTime/ZonedTime.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.DateAndTime;
 
diff --git a/Axuno.Tools/ExpiringTripleDES.cs b/Axuno.Tools/ExpiringTripleDES.cs
index c82ffd05..4074c772 100644
--- a/Axuno.Tools/ExpiringTripleDES.cs
+++ b/Axuno.Tools/ExpiringTripleDES.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
+using System.Text;
 using System.Security.Cryptography;
 
 
diff --git a/Axuno.Tools/FileSystem/DelayedEvent.cs b/Axuno.Tools/FileSystem/DelayedEvent.cs
index 364908c1..ee82a29b 100644
--- a/Axuno.Tools/FileSystem/DelayedEvent.cs
+++ b/Axuno.Tools/FileSystem/DelayedEvent.cs
@@ -1,6 +1,4 @@
-using System.IO;
-
-namespace Axuno.Tools.FileSystem;
+namespace Axuno.Tools.FileSystem;
 
 /// <summary>
 /// The <see cref="DelayedEvent"/> class  wraps <see cref="FileSystemEventArgs"/> and <see cref="RenamedEventArgs"/> objects
diff --git a/Axuno.Tools/FileSystem/DelayedFileSystemWatcher.cs b/Axuno.Tools/FileSystem/DelayedFileSystemWatcher.cs
index 0721fed0..4de50b4e 100644
--- a/Axuno.Tools/FileSystem/DelayedFileSystemWatcher.cs
+++ b/Axuno.Tools/FileSystem/DelayedFileSystemWatcher.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.IO;
-using System.Threading;
 using System.Timers;
 
 namespace Axuno.Tools.FileSystem;
diff --git a/Axuno.Tools/GeoSpatial/Angle.cs b/Axuno.Tools/GeoSpatial/Angle.cs
index 13e2e78d..38a94e80 100644
--- a/Axuno.Tools/GeoSpatial/Angle.cs
+++ b/Axuno.Tools/GeoSpatial/Angle.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.GeoSpatial;
 
diff --git a/Axuno.Tools/GeoSpatial/GoogleGeo.cs b/Axuno.Tools/GeoSpatial/GoogleGeo.cs
index 084800ec..abc04e9c 100644
--- a/Axuno.Tools/GeoSpatial/GoogleGeo.cs
+++ b/Axuno.Tools/GeoSpatial/GoogleGeo.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Globalization;
-using System.Net.Http;
+using System.Globalization;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using System.Web;
 using System.Xml;
 
diff --git a/Axuno.Tools/GeoSpatial/Latitude.cs b/Axuno.Tools/GeoSpatial/Latitude.cs
index 9ce5d3dc..0c71719f 100644
--- a/Axuno.Tools/GeoSpatial/Latitude.cs
+++ b/Axuno.Tools/GeoSpatial/Latitude.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.GeoSpatial;
 
diff --git a/Axuno.Tools/GeoSpatial/Location.Parser.cs b/Axuno.Tools/GeoSpatial/Location.Parser.cs
index 8d0b3428..f8bd4349 100644
--- a/Axuno.Tools/GeoSpatial/Location.Parser.cs
+++ b/Axuno.Tools/GeoSpatial/Location.Parser.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using System.Text.RegularExpressions;
 
 namespace Axuno.Tools.GeoSpatial;
diff --git a/Axuno.Tools/GeoSpatial/Location.cs b/Axuno.Tools/GeoSpatial/Location.cs
index 4d054fbb..8549931e 100644
--- a/Axuno.Tools/GeoSpatial/Location.cs
+++ b/Axuno.Tools/GeoSpatial/Location.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
diff --git a/Axuno.Tools/GeoSpatial/LocationCollection.cs b/Axuno.Tools/GeoSpatial/LocationCollection.cs
index c88361e5..a24312b2 100644
--- a/Axuno.Tools/GeoSpatial/LocationCollection.cs
+++ b/Axuno.Tools/GeoSpatial/LocationCollection.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
 using System.Globalization;
 using System.Text;
 using System.Xml;
diff --git a/Axuno.Tools/GeoSpatial/LocationStyles.cs b/Axuno.Tools/GeoSpatial/LocationStyles.cs
index 7b675ef9..a3d6eaf1 100644
--- a/Axuno.Tools/GeoSpatial/LocationStyles.cs
+++ b/Axuno.Tools/GeoSpatial/LocationStyles.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Axuno.Tools.GeoSpatial;
+namespace Axuno.Tools.GeoSpatial;
 
 /// <summary>
 /// Determines the styles permitted in string arguments that are passed
diff --git a/Axuno.Tools/GeoSpatial/Longitude.cs b/Axuno.Tools/GeoSpatial/Longitude.cs
index 3ce0af71..6dbf7a20 100644
--- a/Axuno.Tools/GeoSpatial/Longitude.cs
+++ b/Axuno.Tools/GeoSpatial/Longitude.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.GeoSpatial;
 
diff --git a/Axuno.Tools/GeoSpatial/MaidenheadLocator.cs b/Axuno.Tools/GeoSpatial/MaidenheadLocator.cs
index e22f4d47..c55eb447 100644
--- a/Axuno.Tools/GeoSpatial/MaidenheadLocator.cs
+++ b/Axuno.Tools/GeoSpatial/MaidenheadLocator.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text.RegularExpressions;
 
 namespace Axuno.Tools.GeoSpatial;
diff --git a/Axuno.Tools/GermanFederalStates.cs b/Axuno.Tools/GermanFederalStates.cs
index bf65beb1..d1d5e41a 100644
--- a/Axuno.Tools/GermanFederalStates.cs
+++ b/Axuno.Tools/GermanFederalStates.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
+using System.Collections.ObjectModel;
 
 namespace Axuno.Tools;
 
diff --git a/Axuno.Tools/GermanHolidays.cs b/Axuno.Tools/GermanHolidays.cs
index 2157c07a..db98e329 100644
--- a/Axuno.Tools/GermanHolidays.cs
+++ b/Axuno.Tools/GermanHolidays.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Xml.Linq;
 
 namespace Axuno.Tools;
diff --git a/Axuno.Tools/Hash.cs b/Axuno.Tools/Hash.cs
index 09444339..a81aebb5 100644
--- a/Axuno.Tools/Hash.cs
+++ b/Axuno.Tools/Hash.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Security.Cryptography;
 using System.Text;
 
diff --git a/Axuno.Tools/Password/Password_Checker.cs b/Axuno.Tools/Password/Password_Checker.cs
index 3b72f618..6173032a 100644
--- a/Axuno.Tools/Password/Password_Checker.cs
+++ b/Axuno.Tools/Password/Password_Checker.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Data;
 using System.Globalization;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Axuno.Tools.Password;
 
diff --git a/Axuno.Tools/Password/Password_Reset.cs b/Axuno.Tools/Password/Password_Reset.cs
index 1bcdd009..941d3382 100644
--- a/Axuno.Tools/Password/Password_Reset.cs
+++ b/Axuno.Tools/Password/Password_Reset.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace Axuno.Tools.Password;
 
diff --git a/Axuno.Tools/StringFormatter.cs b/Axuno.Tools/StringFormatter.cs
index 445d62c4..f25e3268 100644
--- a/Axuno.Tools/StringFormatter.cs
+++ b/Axuno.Tools/StringFormatter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Axuno.Tools;
+namespace Axuno.Tools;
 
 public class StringFormatter
 {
diff --git a/Axuno.Web/Axuno.Web.csproj b/Axuno.Web/Axuno.Web.csproj
index a84242f3..e6997611 100644
--- a/Axuno.Web/Axuno.Web.csproj
+++ b/Axuno.Web/Axuno.Web.csproj
@@ -5,6 +5,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1591</NoWarn>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Axuno.Web/CaptchaSvgGenerator.cs b/Axuno.Web/CaptchaSvgGenerator.cs
index d1248757..dd66a81d 100644
--- a/Axuno.Web/CaptchaSvgGenerator.cs
+++ b/Axuno.Web/CaptchaSvgGenerator.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Globalization;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Axuno.Web;
diff --git a/Axuno.Web/UrlEncoding.cs b/Axuno.Web/UrlEncoding.cs
index a5a318f9..d99cac42 100644
--- a/Axuno.Web/UrlEncoding.cs
+++ b/Axuno.Web/UrlEncoding.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.IdentityModel.Tokens;
 
 namespace Axuno.Web;
 
diff --git a/League.Demo/Controllers/Home.cs b/League.Demo/Controllers/Home.cs
index f4edd609..cd16c55d 100644
--- a/League.Demo/Controllers/Home.cs
+++ b/League.Demo/Controllers/Home.cs
@@ -1,7 +1,5 @@
-using System.Linq;
-using League.Views;
+using League.Views;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
 namespace League.WebApp.Controllers;
diff --git a/League.Demo/League.Demo.csproj b/League.Demo/League.Demo.csproj
index b10c6770..9aa99ead 100644
--- a/League.Demo/League.Demo.csproj
+++ b/League.Demo/League.Demo.csproj
@@ -6,6 +6,7 @@
         <NeutralLanguage>en</NeutralLanguage>
         <!-- With dotnet, add parameter: -p:SatelliteResourceLanguages="""en;de""" -->
         <SatelliteResourceLanguages>en;de</SatelliteResourceLanguages>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/League.Demo/Models/ErrorViewModel.cs b/League.Demo/Models/ErrorViewModel.cs
index ca46ebc1..b25bafc1 100644
--- a/League.Demo/Models/ErrorViewModel.cs
+++ b/League.Demo/Models/ErrorViewModel.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace League.WebApp.Models;
 
 public class ErrorViewModel
diff --git a/League.Demo/Program.cs b/League.Demo/Program.cs
index 0a04492e..78efe1b5 100644
--- a/League.Demo/Program.cs
+++ b/League.Demo/Program.cs
@@ -1,12 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 using Axuno.BackgroundTask;
 using NLog;
diff --git a/League.Demo/ViewComponents/CustomMainNavigationNodeBuilder.cs b/League.Demo/ViewComponents/CustomMainNavigationNodeBuilder.cs
index c94784eb..332d3462 100644
--- a/League.Demo/ViewComponents/CustomMainNavigationNodeBuilder.cs
+++ b/League.Demo/ViewComponents/CustomMainNavigationNodeBuilder.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using League.Components;
+using League.Components;
 using League.MultiTenancy;
 using League.WebApp.Controllers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
 namespace League.WebApp.ViewComponents;
diff --git a/League.Demo/Views/Home/AboutLeague.de.cshtml b/League.Demo/Views/Home/AboutLeague.de.cshtml
index fb5ab689..446c8f11 100644
--- a/League.Demo/Views/Home/AboutLeague.de.cshtml
+++ b/League.Demo/Views/Home/AboutLeague.de.cshtml
@@ -2,7 +2,6 @@
 @using League.Routing
 @using League.WebApp
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@using System.Reflection
 @{
     ViewData.Title("Über Volleyball-Liga");
 }
diff --git a/League.Demo/Views/Home/Overview.cshtml b/League.Demo/Views/Home/Overview.cshtml
index e170bb3b..94d082b3 100644
--- a/League.Demo/Views/Home/Overview.cshtml
+++ b/League.Demo/Views/Home/Overview.cshtml
@@ -1,5 +1,4 @@
 @using League.Helpers
-@using League.TagHelpers
 @using Microsoft.AspNetCore.Mvc.Localization
 @using TournamentManager.MultiTenancy
 @inject IViewLocalizer Localizer
diff --git a/League.Demo/WebAppStartup.cs b/League.Demo/WebAppStartup.cs
index d613a8f8..a37e22ea 100644
--- a/League.Demo/WebAppStartup.cs
+++ b/League.Demo/WebAppStartup.cs
@@ -1,11 +1,5 @@
-using System.IO;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using League.Components;
 using League.WebApp.ViewComponents;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 using Microsoft.Extensions.FileProviders;
 
diff --git a/League.Tests/Caching/ReportSheetCacheTests.cs b/League.Tests/Caching/ReportSheetCacheTests.cs
index c8d3549c..f8aa60ff 100644
--- a/League.Tests/Caching/ReportSheetCacheTests.cs
+++ b/League.Tests/Caching/ReportSheetCacheTests.cs
@@ -3,12 +3,7 @@
 // Licensed under the MIT license.
 //
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using League.Caching;
 using League.Tests.TestComponents;
 using Microsoft.AspNetCore.Hosting;
diff --git a/League.Tests/Identity/RoleStoreTests.cs b/League.Tests/Identity/RoleStoreTests.cs
index 0c5cf61f..b2363c52 100644
--- a/League.Tests/Identity/RoleStoreTests.cs
+++ b/League.Tests/Identity/RoleStoreTests.cs
@@ -1,10 +1,6 @@
 using Microsoft.AspNetCore.Identity;
-using System;
 using System.Data;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/League.Tests/Identity/UserAuthenticationTokenStoreTests.cs b/League.Tests/Identity/UserAuthenticationTokenStoreTests.cs
index d2516941..85fae34c 100644
--- a/League.Tests/Identity/UserAuthenticationTokenStoreTests.cs
+++ b/League.Tests/Identity/UserAuthenticationTokenStoreTests.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using System;
 using System.Data;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using TournamentManager.DAL.DatabaseSpecific;
diff --git a/League.Tests/Identity/UserClaimStoreTests.cs b/League.Tests/Identity/UserClaimStoreTests.cs
index 3830ef1a..f6606e64 100644
--- a/League.Tests/Identity/UserClaimStoreTests.cs
+++ b/League.Tests/Identity/UserClaimStoreTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
+using System.Data;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/League.Tests/Identity/UserLoginStoreTests.cs b/League.Tests/Identity/UserLoginStoreTests.cs
index d936a285..bcc23f5a 100644
--- a/League.Tests/Identity/UserLoginStoreTests.cs
+++ b/League.Tests/Identity/UserLoginStoreTests.cs
@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using System;
 using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using TournamentManager.DAL.DatabaseSpecific;
diff --git a/League.Tests/Identity/UserRoleStoreTests.cs b/League.Tests/Identity/UserRoleStoreTests.cs
index a2f33a39..fde6a177 100644
--- a/League.Tests/Identity/UserRoleStoreTests.cs
+++ b/League.Tests/Identity/UserRoleStoreTests.cs
@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using System;
 using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/League.Tests/Identity/UserStoreTests.cs b/League.Tests/Identity/UserStoreTests.cs
index d7027b61..0640d3fb 100644
--- a/League.Tests/Identity/UserStoreTests.cs
+++ b/League.Tests/Identity/UserStoreTests.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using System;
 using System.Data;
-using System.Threading.Tasks;
-using System.Threading;
 using League.Identity;
 using NUnit.Framework;
 using TournamentManager.DAL.DatabaseSpecific;
diff --git a/League.Tests/IntegrationTests/BasicIntegrationTests.cs b/League.Tests/IntegrationTests/BasicIntegrationTests.cs
index d31c8eda..8e8ac0f0 100644
--- a/League.Tests/IntegrationTests/BasicIntegrationTests.cs
+++ b/League.Tests/IntegrationTests/BasicIntegrationTests.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using NUnit.Framework;
 
diff --git a/League.Tests/League.Tests.csproj b/League.Tests/League.Tests.csproj
index a35522e4..6c96cc94 100644
--- a/League.Tests/League.Tests.csproj
+++ b/League.Tests/League.Tests.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/League.Tests/TestComponents/CultureSwitcher.cs b/League.Tests/TestComponents/CultureSwitcher.cs
index 98d841ca..a9e17de1 100644
--- a/League.Tests/TestComponents/CultureSwitcher.cs
+++ b/League.Tests/TestComponents/CultureSwitcher.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace League.Tests.TestComponents;
 
diff --git a/League.Tests/TestComponents/DirectoryLocator.cs b/League.Tests/TestComponents/DirectoryLocator.cs
index c0c99990..62f616ce 100644
--- a/League.Tests/TestComponents/DirectoryLocator.cs
+++ b/League.Tests/TestComponents/DirectoryLocator.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Reflection;
+using System.Reflection;
 #nullable enable
 namespace League.Tests.TestComponents;
 
diff --git a/League.Tests/TestComponents/UnitTestHelpers.cs b/League.Tests/TestComponents/UnitTestHelpers.cs
index a9870082..853b89c4 100644
--- a/League.Tests/TestComponents/UnitTestHelpers.cs
+++ b/League.Tests/TestComponents/UnitTestHelpers.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
+using System.Globalization;
 using Axuno.VirtualFileSystem;
 using League.Caching;
 using League.Identity;
diff --git a/League.Tests/TextTemplating/EmailTemplateTests.cs b/League.Tests/TextTemplating/EmailTemplateTests.cs
index f8a617ec..71d69ad5 100644
--- a/League.Tests/TextTemplating/EmailTemplateTests.cs
+++ b/League.Tests/TextTemplating/EmailTemplateTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
 using Axuno.TextTemplating;
 using League.Emailing.TemplateModels;
 using League.Models.ContactViewModels;
diff --git a/League/ApiControllers/Cron.cs b/League/ApiControllers/Cron.cs
index ed5de75a..dc4c86a9 100644
--- a/League/ApiControllers/Cron.cs
+++ b/League/ApiControllers/Cron.cs
@@ -1,18 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net.Http;
-using System.Threading.Tasks;
-using League.BackgroundTasks;
+using League.BackgroundTasks;
 using League.Controllers;
 using League.Emailing.Creators;
 using League.MultiTenancy;
 using League.Routing;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Areas/Admin/Controllers/Debug.cs b/League/Areas/Admin/Controllers/Debug.cs
index a0371399..6c962291 100644
--- a/League/Areas/Admin/Controllers/Debug.cs
+++ b/League/Areas/Admin/Controllers/Debug.cs
@@ -3,13 +3,8 @@
 // Licensed under the MIT license.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using League.Controllers;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 
 #if DEBUG
 
diff --git a/League/Areas/Admin/Controllers/Impersonation.cs b/League/Areas/Admin/Controllers/Impersonation.cs
index e5735d83..f03863d7 100644
--- a/League/Areas/Admin/Controllers/Impersonation.cs
+++ b/League/Areas/Admin/Controllers/Impersonation.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Runtime;
+using System.Net;
 using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
 using League.Controllers;
 using League.Identity;
 using League.Routing;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/Areas/Admin/Controllers/System.cs b/League/Areas/Admin/Controllers/System.cs
index ee6f7461..b56319d5 100644
--- a/League/Areas/Admin/Controllers/System.cs
+++ b/League/Areas/Admin/Controllers/System.cs
@@ -1,8 +1,6 @@
 using League.Controllers;
 using League.Identity;
 using League.Routing;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 
 namespace League.Areas.Admin.Controllers;
 
diff --git a/League/Areas/Admin/Views/Shared/_Layout.cshtml b/League/Areas/Admin/Views/Shared/_Layout.cshtml
index 05c0e9bf..3379cb3e 100644
--- a/League/Areas/Admin/Views/Shared/_Layout.cshtml
+++ b/League/Areas/Admin/Views/Shared/_Layout.cshtml
@@ -1,6 +1,5 @@
 @using League.Helpers
 @using Microsoft.AspNetCore.Mvc.Localization
-@using Microsoft.Extensions.Localization
 @using TournamentManager.MultiTenancy
 @inject ITenantContext TenantContext
 @inject IViewLocalizer Localizer
diff --git a/League/Authorization/MatchAuthorizationHandler.cs b/League/Authorization/MatchAuthorizationHandler.cs
index f008263c..ba110b3a 100644
--- a/League/Authorization/MatchAuthorizationHandler.cs
+++ b/League/Authorization/MatchAuthorizationHandler.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
 using TournamentManager.DAL.EntityClasses;
 
 namespace League.Authorization;
diff --git a/League/Authorization/TeamAuthorizationHandler.cs b/League/Authorization/TeamAuthorizationHandler.cs
index b3f427a6..62be3ae6 100644
--- a/League/Authorization/TeamAuthorizationHandler.cs
+++ b/League/Authorization/TeamAuthorizationHandler.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
 using TournamentManager.DAL.EntityClasses;
 
 namespace League.Authorization;
diff --git a/League/Authorization/VenueAuthorizationHandler.cs b/League/Authorization/VenueAuthorizationHandler.cs
index de6ebb0b..a292ba24 100644
--- a/League/Authorization/VenueAuthorizationHandler.cs
+++ b/League/Authorization/VenueAuthorizationHandler.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Authorization;
diff --git a/League/BackgroundTasks/RankingUpdateTask.cs b/League/BackgroundTasks/RankingUpdateTask.cs
index d9abe6ab..a422c19d 100644
--- a/League/BackgroundTasks/RankingUpdateTask.cs
+++ b/League/BackgroundTasks/RankingUpdateTask.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Axuno.BackgroundTask;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
+using Axuno.BackgroundTask;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/BackgroundTasks/SendEmailTask.cs b/League/BackgroundTasks/SendEmailTask.cs
index 3aa25fe6..0f593ee4 100644
--- a/League/BackgroundTasks/SendEmailTask.cs
+++ b/League/BackgroundTasks/SendEmailTask.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Axuno.BackgroundTask;
+using Axuno.BackgroundTask;
 using Axuno.TextTemplating;
 using League.Emailing.Creators;
 using League.Templates.Email.Localization;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
 namespace League.BackgroundTasks;
diff --git a/League/Caching/ReportSheetCache.cs b/League/Caching/ReportSheetCache.cs
index 5dbf3797..db46437d 100644
--- a/League/Caching/ReportSheetCache.cs
+++ b/League/Caching/ReportSheetCache.cs
@@ -3,13 +3,6 @@
 // Licensed under the MIT license.
 //
 
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using TournamentManager.DAL.TypedViewClasses;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Components/IMainNavigationNodeBuilder.cs b/League/Components/IMainNavigationNodeBuilder.cs
index d963e1f0..7ea94f1d 100644
--- a/League/Components/IMainNavigationNodeBuilder.cs
+++ b/League/Components/IMainNavigationNodeBuilder.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace League.Components;
+namespace League.Components;
 
 /// <summary>
 /// Interface for navigation node builders.
diff --git a/League/Components/MainNavigation.cs b/League/Components/MainNavigation.cs
index 12f7cb5b..08ca0c7b 100644
--- a/League/Components/MainNavigation.cs
+++ b/League/Components/MainNavigation.cs
@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace League.Components;
+namespace League.Components;
 
 /// <summary>
 /// <see cref="ViewComponent"/> to display the main navigation based on bootstrap 4
diff --git a/League/Components/MainNavigationComponentModel.cs b/League/Components/MainNavigationComponentModel.cs
index e9c0758b..5b6ef0d1 100644
--- a/League/Components/MainNavigationComponentModel.cs
+++ b/League/Components/MainNavigationComponentModel.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace League.Components;
+namespace League.Components;
 
 /// <summary>
 /// The component model for the <see cref="MainNavigation"/> <see cref="Microsoft.AspNetCore.Mvc.ViewComponent"/>.
diff --git a/League/Components/MainNavigationComponentModelExtensions.cs b/League/Components/MainNavigationComponentModelExtensions.cs
index aec7b84e..d033cb01 100644
--- a/League/Components/MainNavigationComponentModelExtensions.cs
+++ b/League/Components/MainNavigationComponentModelExtensions.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace League.Components;
+namespace League.Components;
 
 /// <summary>
 /// Extensions for the <see cref="MainNavigationComponentModel"/> and <see cref="MainNavigationComponentModel.NavigationNode"/>.
diff --git a/League/Components/MainNavigationNodeBuilder.cs b/League/Components/MainNavigationNodeBuilder.cs
index cd5728af..5bda4d76 100644
--- a/League/Components/MainNavigationNodeBuilder.cs
+++ b/League/Components/MainNavigationNodeBuilder.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using League.Authorization;
 using League.Controllers;
 using League.MultiTenancy;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
 namespace League.Components;
diff --git a/League/Components/RoundSelector.cs b/League/Components/RoundSelector.cs
index 27248a40..f49a278a 100644
--- a/League/Components/RoundSelector.cs
+++ b/League/Components/RoundSelector.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Components/RoundSelectorComponentModel.cs b/League/Components/RoundSelectorComponentModel.cs
index a4090c5f..1acbcbf9 100644
--- a/League/Components/RoundSelectorComponentModel.cs
+++ b/League/Components/RoundSelectorComponentModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using League.Resources;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/Components/TeamEditor.cs b/League/Components/TeamEditor.cs
index d88d41e6..0b67a08c 100644
--- a/League/Components/TeamEditor.cs
+++ b/League/Components/TeamEditor.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace League.Components;
+namespace League.Components;
 
 public class TeamEditor : ViewComponent
 {
diff --git a/League/Components/TeamEditorComponentModel.cs b/League/Components/TeamEditorComponentModel.cs
index acd9bfbf..333d281a 100644
--- a/League/Components/TeamEditorComponentModel.cs
+++ b/League/Components/TeamEditorComponentModel.cs
@@ -1,7 +1,5 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using League.Resources;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.EntityClasses;
 
diff --git a/League/Components/VenueEditor.cs b/League/Components/VenueEditor.cs
index b00c106c..ca9e3a7c 100644
--- a/League/Components/VenueEditor.cs
+++ b/League/Components/VenueEditor.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace League.Components;
+namespace League.Components;
 
 public class VenueEditor : ViewComponent
 {
diff --git a/League/Components/VenueEditorComponentModel.cs b/League/Components/VenueEditorComponentModel.cs
index 04b75eb8..da63ef48 100644
--- a/League/Components/VenueEditorComponentModel.cs
+++ b/League/Components/VenueEditorComponentModel.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using League.Models.VenueViewModels;
 using League.Resources;
-using Microsoft.AspNetCore.Mvc;
 using TournamentManager.DAL.EntityClasses;
 
 namespace League.Components;
diff --git a/League/Components/VenueSelector.cs b/League/Components/VenueSelector.cs
index 99a7fa96..f1cb375e 100644
--- a/League/Components/VenueSelector.cs
+++ b/League/Components/VenueSelector.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Components/VenueSelectorComponentModel.cs b/League/Components/VenueSelectorComponentModel.cs
index 9bdfc936..1b11c266 100644
--- a/League/Components/VenueSelectorComponentModel.cs
+++ b/League/Components/VenueSelectorComponentModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 
 namespace League.Components;
 
diff --git a/League/ControllerAttributes/TeamApplicationAllowedAttribute.cs b/League/ControllerAttributes/TeamApplicationAllowedAttribute.cs
index 12c4af29..a51be792 100644
--- a/League/ControllerAttributes/TeamApplicationAllowedAttribute.cs
+++ b/League/ControllerAttributes/TeamApplicationAllowedAttribute.cs
@@ -1,8 +1,5 @@
-using System;
-using League.MultiTenancy;
-using Microsoft.AspNetCore.Mvc;
+using League.MultiTenancy;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
 using TournamentManager.MultiTenancy;
 
 namespace League.ControllerAttributes;
diff --git a/League/Controllers/AbstractController.cs b/League/Controllers/AbstractController.cs
index 2512a2a8..04ec065b 100644
--- a/League/Controllers/AbstractController.cs
+++ b/League/Controllers/AbstractController.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using League.MultiTenancy;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
+using League.MultiTenancy;
 
 namespace League.Controllers;
 
diff --git a/League/Controllers/Account.cs b/League/Controllers/Account.cs
index 20bc0827..6bc6c800 100644
--- a/League/Controllers/Account.cs
+++ b/League/Controllers/Account.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Globalization;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
 using Axuno.Web;
 using League.BackgroundTasks;
 using League.Emailing.Creators;
@@ -13,13 +8,6 @@
 using League.Routing;
 using League.Templates.Email;
 using League.Views;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Controllers/Captcha.cs b/League/Controllers/Captcha.cs
index b9416375..6a012bbb 100644
--- a/League/Controllers/Captcha.cs
+++ b/League/Controllers/Captcha.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Drawing;
-using System.Threading.Tasks;
+using System.Drawing;
 using Axuno.Web;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 
 namespace League.Controllers;
 
diff --git a/League/Controllers/Contact.cs b/League/Controllers/Contact.cs
index 2dff8995..1817f68f 100644
--- a/League/Controllers/Contact.cs
+++ b/League/Controllers/Contact.cs
@@ -1,17 +1,10 @@
-using System.Globalization;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 using Axuno.Web;
 using League.BackgroundTasks;
 using League.Models.AccountViewModels;
 using League.Models.ContactViewModels;
 using League.Routing;
 using League.Views;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
 namespace League.Controllers;
diff --git a/League/Controllers/Error.cs b/League/Controllers/Error.cs
index 3cd3731b..6df6d428 100644
--- a/League/Controllers/Error.cs
+++ b/League/Controllers/Error.cs
@@ -1,9 +1,5 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using League.Models.Error;
+using League.Models.Error;
 using League.Routing;
-using Microsoft.Extensions.Localization;
 using TournamentManager.MultiTenancy;
 
 namespace League.Controllers;
diff --git a/League/Controllers/Language.cs b/League/Controllers/Language.cs
index 13c07a9b..29e24ac6 100644
--- a/League/Controllers/Language.cs
+++ b/League/Controllers/Language.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Linq;
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Localization;
-using Microsoft.Extensions.Options;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Logging;
+using System.Net;
 
 namespace League.Controllers;
 
diff --git a/League/Controllers/Manage.cs b/League/Controllers/Manage.cs
index 9246ad12..30505ad2 100644
--- a/League/Controllers/Manage.cs
+++ b/League/Controllers/Manage.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Axuno.Web;
 using League.BackgroundTasks;
 using League.Emailing.Creators;
@@ -11,18 +6,11 @@
 using League.Models.ManageViewModels;
 using League.TagHelpers;
 using League.Views;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DI;
 using TournamentManager.MultiTenancy;
 using League.MultiTenancy;
 using League.Routing;
-using Microsoft.AspNetCore.Routing;
 
 namespace League.Controllers;
 
diff --git a/League/Controllers/Map.cs b/League/Controllers/Map.cs
index e05f7b20..b2dd4339 100644
--- a/League/Controllers/Map.cs
+++ b/League/Controllers/Map.cs
@@ -1,13 +1,6 @@
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using League.ConfigurationPoco;
+using League.ConfigurationPoco;
 using League.Models.MapViewModels;
 using League.Routing;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
diff --git a/League/Controllers/Match.cs b/League/Controllers/Match.cs
index 5346e418..2a1f1781 100644
--- a/League/Controllers/Match.cs
+++ b/League/Controllers/Match.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text;
 using League.BackgroundTasks;
 using League.Caching;
 using League.Emailing.Creators;
@@ -14,13 +8,6 @@
 using League.Routing;
 using League.Views;
 using MailMergeLib.AspNet;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/Controllers/Ranking.cs b/League/Controllers/Ranking.cs
index af20dfb9..f129e3fa 100644
--- a/League/Controllers/Ranking.cs
+++ b/League/Controllers/Ranking.cs
@@ -1,17 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using League.BackgroundTasks;
+using League.BackgroundTasks;
 using League.Models.RankingViewModels;
 using League.MultiTenancy;
 using League.Routing;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
diff --git a/League/Controllers/Role.cs b/League/Controllers/Role.cs
index fb65bb26..ce357e04 100644
--- a/League/Controllers/Role.cs
+++ b/League/Controllers/Role.cs
@@ -1,18 +1,10 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using League.Helpers;
 using League.Models.RoleViewModels;
 using League.Models.TeamViewModels;
 using League.MultiTenancy;
 using League.Routing;
 using League.TagHelpers;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Controllers/Team.cs b/League/Controllers/Team.cs
index 91648d6b..99a831a7 100644
--- a/League/Controllers/Team.cs
+++ b/League/Controllers/Team.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using League.Components;
 using League.Helpers;
 using League.Models.TeamViewModels;
@@ -11,13 +6,6 @@
 using League.MultiTenancy;
 using League.Routing;
 using League.TagHelpers;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
diff --git a/League/Controllers/TeamApplication.cs b/League/Controllers/TeamApplication.cs
index 41178fa3..b6145240 100644
--- a/League/Controllers/TeamApplication.cs
+++ b/League/Controllers/TeamApplication.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Axuno.Tools.GeoSpatial;
+using Axuno.Tools.GeoSpatial;
 using League.BackgroundTasks;
 using League.Components;
 using League.ConfigurationPoco;
@@ -16,13 +10,6 @@
 using League.MultiTenancy;
 using League.Routing;
 using League.TagHelpers;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
diff --git a/League/Controllers/Upload.cs b/League/Controllers/Upload.cs
index 262dc0f5..97324778 100644
--- a/League/Controllers/Upload.cs
+++ b/League/Controllers/Upload.cs
@@ -1,17 +1,6 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using League.Models.UploadViewModels;
+using League.Models.UploadViewModels;
 using League.MultiTenancy;
 using League.Routing;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/Controllers/Venue.cs b/League/Controllers/Venue.cs
index 12cb8ed1..a2b8b453 100644
--- a/League/Controllers/Venue.cs
+++ b/League/Controllers/Venue.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Axuno.Tools.GeoSpatial;
+using Axuno.Tools.GeoSpatial;
 using League.Components;
 using League.ConfigurationPoco;
 using League.Helpers;
@@ -13,11 +7,6 @@
 using League.MultiTenancy;
 using League.Routing;
 using League.TagHelpers;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/DataProtection/DataProtector.cs b/League/DataProtection/DataProtector.cs
index 2efc1289..26fa25e1 100644
--- a/League/DataProtection/DataProtector.cs
+++ b/League/DataProtection/DataProtector.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using Microsoft.AspNetCore.DataProtection;
 using Newtonsoft.Json;
 
diff --git a/League/Emailing/Creators/AnnounceNextMatchCreator.cs b/League/Emailing/Creators/AnnounceNextMatchCreator.cs
index 8a47ac62..8cd47171 100644
--- a/League/Emailing/Creators/AnnounceNextMatchCreator.cs
+++ b/League/Emailing/Creators/AnnounceNextMatchCreator.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/Emailing/Creators/ChangeFixtureCreator.cs b/League/Emailing/Creators/ChangeFixtureCreator.cs
index b7e8c4d7..7359bd44 100644
--- a/League/Emailing/Creators/ChangeFixtureCreator.cs
+++ b/League/Emailing/Creators/ChangeFixtureCreator.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/Emailing/Creators/ChangePrimaryUserEmailCreator.cs b/League/Emailing/Creators/ChangePrimaryUserEmailCreator.cs
index 4354eb4e..fa61e772 100644
--- a/League/Emailing/Creators/ChangePrimaryUserEmailCreator.cs
+++ b/League/Emailing/Creators/ChangePrimaryUserEmailCreator.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
@@ -10,7 +6,6 @@
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using TournamentManager.MultiTenancy;
 
 namespace League.Emailing.Creators;
diff --git a/League/Emailing/Creators/ChangeUserAccountCreator.cs b/League/Emailing/Creators/ChangeUserAccountCreator.cs
index a9583918..cfa7f135 100644
--- a/League/Emailing/Creators/ChangeUserAccountCreator.cs
+++ b/League/Emailing/Creators/ChangeUserAccountCreator.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using TournamentManager.MultiTenancy;
 
 namespace League.Emailing.Creators;
diff --git a/League/Emailing/Creators/ConfirmTeamApplicationCreator.cs b/League/Emailing/Creators/ConfirmTeamApplicationCreator.cs
index 549e4a73..fb6eb686 100644
--- a/League/Emailing/Creators/ConfirmTeamApplicationCreator.cs
+++ b/League/Emailing/Creators/ConfirmTeamApplicationCreator.cs
@@ -1,15 +1,10 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
diff --git a/League/Emailing/Creators/ContactFormCreator.cs b/League/Emailing/Creators/ContactFormCreator.cs
index 252cb531..f0c022a1 100644
--- a/League/Emailing/Creators/ContactFormCreator.cs
+++ b/League/Emailing/Creators/ContactFormCreator.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using TournamentManager.MultiTenancy;
 
 namespace League.Emailing.Creators;
diff --git a/League/Emailing/Creators/IMailMessageCreator.cs b/League/Emailing/Creators/IMailMessageCreator.cs
index a3191103..86a12074 100644
--- a/League/Emailing/Creators/IMailMessageCreator.cs
+++ b/League/Emailing/Creators/IMailMessageCreator.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Threading;
-using Axuno.TextTemplating;
+using Axuno.TextTemplating;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using TournamentManager.MultiTenancy;
 
 namespace League.Emailing.Creators;
diff --git a/League/Emailing/Creators/RemindMatchResultCreator.cs b/League/Emailing/Creators/RemindMatchResultCreator.cs
index 010661c1..55fe61d0 100644
--- a/League/Emailing/Creators/RemindMatchResultCreator.cs
+++ b/League/Emailing/Creators/RemindMatchResultCreator.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/Emailing/Creators/ResultEnteredCreator.cs b/League/Emailing/Creators/ResultEnteredCreator.cs
index 887206bf..cca17208 100644
--- a/League/Emailing/Creators/ResultEnteredCreator.cs
+++ b/League/Emailing/Creators/ResultEnteredCreator.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/Emailing/Creators/UrgeMatchResultCreator.cs b/League/Emailing/Creators/UrgeMatchResultCreator.cs
index f0a939bd..3892f9ca 100644
--- a/League/Emailing/Creators/UrgeMatchResultCreator.cs
+++ b/League/Emailing/Creators/UrgeMatchResultCreator.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Runtime.CompilerServices;
 using Axuno.TextTemplating;
 using Axuno.TextTemplating.Localization;
 using League.Emailing.TemplateModels;
 using League.Templates.Email.Localization;
 using MailMergeLib;
 using MailMergeLib.AspNet;
-using Microsoft.Extensions.Localization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/Emailing/MailService.cs b/League/Emailing/MailService.cs
index 9d6092b4..6701d7ce 100644
--- a/League/Emailing/MailService.cs
+++ b/League/Emailing/MailService.cs
@@ -1,8 +1,5 @@
-using System;
-using MailMergeLib.MessageStore;
-using Microsoft.Extensions.DependencyInjection;
+using MailMergeLib.MessageStore;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
 using TournamentManager.MultiTenancy;
 
 namespace MailMergeLib.AspNet;
diff --git a/League/Emailing/RazorViewToStringRenderer.cs b/League/Emailing/RazorViewToStringRenderer.cs
index ed53364c..474b5045 100644
--- a/League/Emailing/RazorViewToStringRenderer.cs
+++ b/League/Emailing/RazorViewToStringRenderer.cs
@@ -1,16 +1,9 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using Microsoft.AspNetCore.Routing;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 /* Copyright (c) .NET Foundation. All rights reserved.
    Licensed under the Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0. See License.txt in the project root for license information.
diff --git a/League/Emailing/TemplateModels/ChangeUserAccountModel.cs b/League/Emailing/TemplateModels/ChangeUserAccountModel.cs
index f980b714..786ec9fc 100644
--- a/League/Emailing/TemplateModels/ChangeUserAccountModel.cs
+++ b/League/Emailing/TemplateModels/ChangeUserAccountModel.cs
@@ -1,5 +1,4 @@
-using System;
-using League.Templates.Email;
+using League.Templates.Email;
 
 namespace League.Emailing.TemplateModels;
 
diff --git a/League/Helpers/MetaDataHelper.cs b/League/Helpers/MetaDataHelper.cs
index 2d2ee43d..d3686ecc 100644
--- a/League/Helpers/MetaDataHelper.cs
+++ b/League/Helpers/MetaDataHelper.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
diff --git a/League/Identity/ApplicationUser.cs b/League/Identity/ApplicationUser.cs
index 7be0102b..183e7e65 100644
--- a/League/Identity/ApplicationUser.cs
+++ b/League/Identity/ApplicationUser.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Security.Principal;
-using Microsoft.AspNetCore.Identity;
+using System.Security.Principal;
 
 namespace League.Identity;
 
diff --git a/League/Identity/Constants.cs b/League/Identity/Constants.cs
index 7dc2e9df..065c34f2 100644
--- a/League/Identity/Constants.cs
+++ b/League/Identity/Constants.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace League.Identity;
 
diff --git a/League/Identity/LeagueClaimsPrincipalFactory.cs b/League/Identity/LeagueClaimsPrincipalFactory.cs
index 8181e44e..34cfcf27 100644
--- a/League/Identity/LeagueClaimsPrincipalFactory.cs
+++ b/League/Identity/LeagueClaimsPrincipalFactory.cs
@@ -1,7 +1,4 @@
 using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
 
 namespace League.Identity;
 
diff --git a/League/Identity/LeagueCookieManager.cs b/League/Identity/LeagueCookieManager.cs
index ac41d607..6f4b8e71 100644
--- a/League/Identity/LeagueCookieManager.cs
+++ b/League/Identity/LeagueCookieManager.cs
@@ -1,6 +1,4 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using TournamentManager.MultiTenancy;
 
 namespace League.Identity;
diff --git a/League/Identity/LeagueUserValidator.cs b/League/Identity/LeagueUserValidator.cs
index c4c0c0f2..f245f6f7 100644
--- a/League/Identity/LeagueUserValidator.cs
+++ b/League/Identity/LeagueUserValidator.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
-
-namespace League.Identity;
+namespace League.Identity;
 
 /// <summary>
 /// Settings to be used by <see cref="LeagueUserValidator{TUser}"/>
diff --git a/League/Identity/MultilanguageIdentityErrorDescriber.cs b/League/Identity/MultilanguageIdentityErrorDescriber.cs
index e9bce30a..9cdbf19d 100644
--- a/League/Identity/MultilanguageIdentityErrorDescriber.cs
+++ b/League/Identity/MultilanguageIdentityErrorDescriber.cs
@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Localization;
-
-namespace League.Identity;
+namespace League.Identity;
 
 public class MultiLanguageIdentityErrorDescriber : IdentityErrorDescriber
 {
diff --git a/League/Identity/RoleStore.cs b/League/Identity/RoleStore.cs
index 140c7b45..2aa73f64 100644
--- a/League/Identity/RoleStore.cs
+++ b/League/Identity/RoleStore.cs
@@ -1,11 +1,4 @@
-using Microsoft.AspNetCore.Identity;
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.Extensions.Logging;
+using System.Security.Claims;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/Identity/UserStore.cs b/League/Identity/UserStore.cs
index 40f2c69a..8acbb4b1 100644
--- a/League/Identity/UserStore.cs
+++ b/League/Identity/UserStore.cs
@@ -1,17 +1,8 @@
-using Microsoft.AspNetCore.Identity;
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.Extensions.Logging;
+using System.Security.Claims;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
-using System.Timers;
 
 #pragma warning disable CA2254 // Template should be a static expression
 namespace League.Identity;
diff --git a/League/League.csproj b/League/League.csproj
index 91bb34d1..c8f74b71 100644
--- a/League/League.csproj
+++ b/League/League.csproj
@@ -22,6 +22,7 @@ Localizations for English and German are included. The library is in operation o
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <!-- With dotnet, add parameter: -p:SatelliteResourceLanguages="""en;de""" -->
         <SatelliteResourceLanguages>en;de</SatelliteResourceLanguages>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -44,6 +45,26 @@ Localizations for English and German are included. The library is in operation o
         <NoWarn>1701;1702;1591</NoWarn>
     </PropertyGroup>
 
+    <ItemGroup>
+        <Using Include="System.Globalization" />
+        <Using Include="Microsoft.AspNetCore.Authorization" />
+        <Using Include="Microsoft.AspNetCore.Builder" />
+        <Using Include="Microsoft.AspNetCore.Hosting" />
+        <Using Include="Microsoft.AspNetCore.Hosting" />
+        <Using Include="Microsoft.AspNetCore.Http" />
+        <Using Include="Microsoft.AspNetCore.Identity" />
+        <Using Include="Microsoft.AspNetCore.Localization" />
+        <Using Include="Microsoft.AspNetCore.Mvc" />
+        <Using Include="Microsoft.AspNetCore.Mvc.Localization" />
+        <Using Include="Microsoft.AspNetCore.Routing" />
+        <Using Include="Microsoft.Extensions.Configuration" />
+        <Using Include="Microsoft.Extensions.DependencyInjection" />
+        <Using Include="Microsoft.Extensions.Hosting" />
+        <Using Include="Microsoft.Extensions.Localization" />
+        <Using Include="Microsoft.Extensions.Logging" />
+        <Using Include="Microsoft.Extensions.Options" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Axuno.TextTemplating" Version="2.0.1" />
         <PackageReference Include="JSNLog" Version="3.0.1" />
diff --git a/League/LeagueStartup.cs b/League/LeagueStartup.cs
index 4cd6a582..1b2ea3fe 100644
--- a/League/LeagueStartup.cs
+++ b/League/LeagueStartup.cs
@@ -9,44 +9,26 @@
 using MailMergeLib.MessageStore;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Localization;
-using Microsoft.AspNetCore.Mvc;
+
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using SD.LLBLGen.Pro.ORMSupportClasses;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Axuno.BackgroundTask;
 using Axuno.VirtualFileSystem;
 using League.BackgroundTasks;
 using League.Caching;
 using League.ConfigurationPoco;
 using League.MultiTenancy;
-using Microsoft.AspNetCore.Authorization;
 using TournamentManager.DI;
 using TournamentManager.MultiTenancy;
 using League.TextTemplatingModule;
-using Microsoft.AspNetCore.Mvc.Localization;
 
 #endregion
 
diff --git a/League/Middleware/ClientAbortMiddleware.cs b/League/Middleware/ClientAbortMiddleware.cs
index 948012a5..3e6886d6 100644
--- a/League/Middleware/ClientAbortMiddleware.cs
+++ b/League/Middleware/ClientAbortMiddleware.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Data.SqlClient;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
+using System.Data.SqlClient;
 
 namespace League.Middleware;
 
diff --git a/League/ModelBinders/DateOnlyModelBinder.cs b/League/ModelBinders/DateOnlyModelBinder.cs
index 49fddfe6..10d73d23 100644
--- a/League/ModelBinders/DateOnlyModelBinder.cs
+++ b/League/ModelBinders/DateOnlyModelBinder.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Globalization;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/DateOnlyModelBinderProvider.cs b/League/ModelBinders/DateOnlyModelBinderProvider.cs
index ff0cc88a..b73f2f94 100644
--- a/League/ModelBinders/DateOnlyModelBinderProvider.cs
+++ b/League/ModelBinders/DateOnlyModelBinderProvider.cs
@@ -1,8 +1,5 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/DateTimeModelBinder.cs b/League/ModelBinders/DateTimeModelBinder.cs
index 929bbb3f..8a0b6ac4 100644
--- a/League/ModelBinders/DateTimeModelBinder.cs
+++ b/League/ModelBinders/DateTimeModelBinder.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Globalization;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/DateTimeModelBinderProvider.cs b/League/ModelBinders/DateTimeModelBinderProvider.cs
index a6d824b3..08637d86 100644
--- a/League/ModelBinders/DateTimeModelBinderProvider.cs
+++ b/League/ModelBinders/DateTimeModelBinderProvider.cs
@@ -1,8 +1,5 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/NoTrimmingAttribute.cs b/League/ModelBinders/NoTrimmingAttribute.cs
index 430bb134..dcb87435 100644
--- a/League/ModelBinders/NoTrimmingAttribute.cs
+++ b/League/ModelBinders/NoTrimmingAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace League.ModelBinders;
+namespace League.ModelBinders;
 
 /// <summary>
 /// When this attribute is set to a model field or property of type <see cref="string"/>, <see cref="StringTrimmingModelBinder"/> will not trim the property value.
diff --git a/League/ModelBinders/StringTrimmingModelBinder.cs b/League/ModelBinders/StringTrimmingModelBinder.cs
index 5da2e1a9..6e1b2c0e 100644
--- a/League/ModelBinders/StringTrimmingModelBinder.cs
+++ b/League/ModelBinders/StringTrimmingModelBinder.cs
@@ -1,8 +1,5 @@
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 
 namespace League.ModelBinders;
diff --git a/League/ModelBinders/StringTrimmingModelBinderProvider.cs b/League/ModelBinders/StringTrimmingModelBinderProvider.cs
index e48a1ddf..edc99dfb 100644
--- a/League/ModelBinders/StringTrimmingModelBinderProvider.cs
+++ b/League/ModelBinders/StringTrimmingModelBinderProvider.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/TimeOnlyModelBinder.cs b/League/ModelBinders/TimeOnlyModelBinder.cs
index 49b59f09..8846bc93 100644
--- a/League/ModelBinders/TimeOnlyModelBinder.cs
+++ b/League/ModelBinders/TimeOnlyModelBinder.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/TimeOnlyModelBinderProvider.cs b/League/ModelBinders/TimeOnlyModelBinderProvider.cs
index 2a554c93..e94e9ef4 100644
--- a/League/ModelBinders/TimeOnlyModelBinderProvider.cs
+++ b/League/ModelBinders/TimeOnlyModelBinderProvider.cs
@@ -1,8 +1,5 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/TimeSpanModelBinder.cs b/League/ModelBinders/TimeSpanModelBinder.cs
index 4ea7543c..49cad056 100644
--- a/League/ModelBinders/TimeSpanModelBinder.cs
+++ b/League/ModelBinders/TimeSpanModelBinder.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
 namespace League.ModelBinders;
 
diff --git a/League/ModelBinders/TimeSpanModelBinderProvider.cs b/League/ModelBinders/TimeSpanModelBinderProvider.cs
index c2ed1069..0c8c49c0 100644
--- a/League/ModelBinders/TimeSpanModelBinderProvider.cs
+++ b/League/ModelBinders/TimeSpanModelBinderProvider.cs
@@ -1,8 +1,5 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace League.ModelBinders;
 
diff --git a/League/Models/AccountViewModels/RegisterViewModel.cs b/League/Models/AccountViewModels/RegisterViewModel.cs
index ea09e317..76e0aecb 100644
--- a/League/Models/AccountViewModels/RegisterViewModel.cs
+++ b/League/Models/AccountViewModels/RegisterViewModel.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using League.Resources;
-using Microsoft.AspNetCore.Mvc;
 
 namespace League.Models.AccountViewModels;
 
diff --git a/League/Models/ErrorViewModels/ErrorViewModel.cs b/League/Models/ErrorViewModels/ErrorViewModel.cs
index 7891583f..e5a25f95 100644
--- a/League/Models/ErrorViewModels/ErrorViewModel.cs
+++ b/League/Models/ErrorViewModels/ErrorViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace League.Models.Error;
+namespace League.Models.Error;
 
 public class ErrorViewModel
 {
diff --git a/League/Models/ManageViewModels/IndexViewModel.cs b/League/Models/ManageViewModels/IndexViewModel.cs
index bd9800f7..3f1e0723 100644
--- a/League/Models/ManageViewModels/IndexViewModel.cs
+++ b/League/Models/ManageViewModels/IndexViewModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using League.Identity;
-using Microsoft.AspNetCore.Identity;
 
 namespace League.Models.ManageViewModels;
 
diff --git a/League/Models/ManageViewModels/ManageLoginsViewModel.cs b/League/Models/ManageViewModels/ManageLoginsViewModel.cs
index 47b9e5d1..e9f41f64 100644
--- a/League/Models/ManageViewModels/ManageLoginsViewModel.cs
+++ b/League/Models/ManageViewModels/ManageLoginsViewModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
 
 namespace League.Models.ManageViewModels;
 
diff --git a/League/Models/MapViewModels/MapModel.cs b/League/Models/MapViewModels/MapModel.cs
index b4de502b..f99435f2 100644
--- a/League/Models/MapViewModels/MapModel.cs
+++ b/League/Models/MapViewModels/MapModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
 using League.ConfigurationPoco;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
diff --git a/League/Models/MatchViewModels/EditFixtureViewModel.cs b/League/Models/MatchViewModels/EditFixtureViewModel.cs
index b251c229..7ac0bbc9 100644
--- a/League/Models/MatchViewModels/EditFixtureViewModel.cs
+++ b/League/Models/MatchViewModels/EditFixtureViewModel.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
diff --git a/League/Models/MatchViewModels/EnterResultViewModel.cs b/League/Models/MatchViewModels/EnterResultViewModel.cs
index 2bb61fa3..6325c2b5 100644
--- a/League/Models/MatchViewModels/EnterResultViewModel.cs
+++ b/League/Models/MatchViewModels/EnterResultViewModel.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Localization;
 using TournamentManager;
 using TournamentManager.DAL;
 using TournamentManager.DAL.EntityClasses;
diff --git a/League/Models/MatchViewModels/FixturesViewModel.cs b/League/Models/MatchViewModels/FixturesViewModel.cs
index 8df341e3..bb4daca7 100644
--- a/League/Models/MatchViewModels/FixturesViewModel.cs
+++ b/League/Models/MatchViewModels/FixturesViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.MatchViewModels;
diff --git a/League/Models/MatchViewModels/ResultsViewModel.cs b/League/Models/MatchViewModels/ResultsViewModel.cs
index 7707d0cd..f99c72c0 100644
--- a/League/Models/MatchViewModels/ResultsViewModel.cs
+++ b/League/Models/MatchViewModels/ResultsViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.MatchViewModels;
diff --git a/League/Models/RankingViewModels/AllTimeTeamModel.cs b/League/Models/RankingViewModels/AllTimeTeamModel.cs
index 547b50b4..3b42de5e 100644
--- a/League/Models/RankingViewModels/AllTimeTeamModel.cs
+++ b/League/Models/RankingViewModels/AllTimeTeamModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using TournamentManager;
+using TournamentManager;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.RankingViewModels;
diff --git a/League/Models/RankingViewModels/AllTimeTournamentModel.cs b/League/Models/RankingViewModels/AllTimeTournamentModel.cs
index 02b3b20b..6e15d581 100644
--- a/League/Models/RankingViewModels/AllTimeTournamentModel.cs
+++ b/League/Models/RankingViewModels/AllTimeTournamentModel.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using TournamentManager;
+using TournamentManager;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.RankingViewModels;
diff --git a/League/Models/RankingViewModels/RankingListModel.cs b/League/Models/RankingViewModels/RankingListModel.cs
index af143dd4..a15f87ea 100644
--- a/League/Models/RankingViewModels/RankingListModel.cs
+++ b/League/Models/RankingViewModels/RankingListModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.RankingViewModels;
diff --git a/League/Models/RoleViewModels/RoleAddModel.cs b/League/Models/RoleViewModels/RoleAddModel.cs
index ded0ecf6..75dc0978 100644
--- a/League/Models/RoleViewModels/RoleAddModel.cs
+++ b/League/Models/RoleViewModels/RoleAddModel.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using League.Resources;
-using Microsoft.AspNetCore.Mvc;
 
 namespace League.Models.RoleViewModels;
 
diff --git a/League/Models/RoleViewModels/RoleRemoveModel.cs b/League/Models/RoleViewModels/RoleRemoveModel.cs
index b3160eb2..c3882a38 100644
--- a/League/Models/RoleViewModels/RoleRemoveModel.cs
+++ b/League/Models/RoleViewModels/RoleRemoveModel.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace League.Models.RoleViewModels;
+namespace League.Models.RoleViewModels;
 
 public class RoleRemoveModel
 {
diff --git a/League/Models/TeamApplicationViewModels/ApplicationListModel.cs b/League/Models/TeamApplicationViewModels/ApplicationListModel.cs
index 71da2393..0112d962 100644
--- a/League/Models/TeamApplicationViewModels/ApplicationListModel.cs
+++ b/League/Models/TeamApplicationViewModels/ApplicationListModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.TeamApplicationViewModels;
diff --git a/League/Models/TeamApplicationViewModels/ApplicationMessageModel.cs b/League/Models/TeamApplicationViewModels/ApplicationMessageModel.cs
index c642f4f2..1053f1a1 100644
--- a/League/Models/TeamApplicationViewModels/ApplicationMessageModel.cs
+++ b/League/Models/TeamApplicationViewModels/ApplicationMessageModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace League.Models.TeamApplicationViewModels;
+namespace League.Models.TeamApplicationViewModels;
 
 public struct TeamApplicationMessageModel
 {
diff --git a/League/Models/TeamApplicationViewModels/ApplicationSelectTeamModel.cs b/League/Models/TeamApplicationViewModels/ApplicationSelectTeamModel.cs
index 0f02f754..1607eaef 100644
--- a/League/Models/TeamApplicationViewModels/ApplicationSelectTeamModel.cs
+++ b/League/Models/TeamApplicationViewModels/ApplicationSelectTeamModel.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using League.Resources;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.TypedViewClasses;
 
diff --git a/League/Models/TeamViewModels/MyTeamMessageModel.cs b/League/Models/TeamViewModels/MyTeamMessageModel.cs
index 1badf53a..157c5005 100644
--- a/League/Models/TeamViewModels/MyTeamMessageModel.cs
+++ b/League/Models/TeamViewModels/MyTeamMessageModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace League.Models.TeamViewModels;
+namespace League.Models.TeamViewModels;
 
 public struct MyTeamMessageModel
 {
diff --git a/League/Models/TeamViewModels/MyTeamShowModel.cs b/League/Models/TeamViewModels/MyTeamShowModel.cs
index f38e00ba..bc0ee7f6 100644
--- a/League/Models/TeamViewModels/MyTeamShowModel.cs
+++ b/League/Models/TeamViewModels/MyTeamShowModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using League.Models.UploadViewModels;
+using League.Models.UploadViewModels;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
diff --git a/League/Models/TeamViewModels/TeamEditModel.cs b/League/Models/TeamViewModels/TeamEditModel.cs
index c9636cd2..028731c9 100644
--- a/League/Models/TeamViewModels/TeamEditModel.cs
+++ b/League/Models/TeamViewModels/TeamEditModel.cs
@@ -1,10 +1,5 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 using League.Components;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
diff --git a/League/Models/TeamViewModels/TeamListModel.cs b/League/Models/TeamViewModels/TeamListModel.cs
index b5c765bf..771d140b 100644
--- a/League/Models/TeamViewModels/TeamListModel.cs
+++ b/League/Models/TeamViewModels/TeamListModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.TeamViewModels;
diff --git a/League/Models/TeamViewModels/TeamSingleModel.cs b/League/Models/TeamViewModels/TeamSingleModel.cs
index 6443d96e..408716bd 100644
--- a/League/Models/TeamViewModels/TeamSingleModel.cs
+++ b/League/Models/TeamViewModels/TeamSingleModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace League.Models.TeamViewModels;
diff --git a/League/Models/TeamViewModels/TeamVenueSelectModel.cs b/League/Models/TeamViewModels/TeamVenueSelectModel.cs
index ccbb66fa..b7f85a6b 100644
--- a/League/Models/TeamViewModels/TeamVenueSelectModel.cs
+++ b/League/Models/TeamViewModels/TeamVenueSelectModel.cs
@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace League.Models.TeamViewModels;
 
diff --git a/League/Models/UploadViewModels/AbstractStaticFile.cs b/League/Models/UploadViewModels/AbstractStaticFile.cs
index 1511e21a..89e9dc48 100644
--- a/League/Models/UploadViewModels/AbstractStaticFile.cs
+++ b/League/Models/UploadViewModels/AbstractStaticFile.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-
-namespace League.Models.UploadViewModels;
+namespace League.Models.UploadViewModels;
 
 /// <summary>
 /// Abstract class for managing static files.
diff --git a/League/Models/UploadViewModels/TeamPhotoStaticFile.cs b/League/Models/UploadViewModels/TeamPhotoStaticFile.cs
index 7a3ec4e5..536e230a 100644
--- a/League/Models/UploadViewModels/TeamPhotoStaticFile.cs
+++ b/League/Models/UploadViewModels/TeamPhotoStaticFile.cs
@@ -1,11 +1,4 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using TournamentManager.MultiTenancy;
+using TournamentManager.MultiTenancy;
 
 namespace League.Models.UploadViewModels;
 
diff --git a/League/Models/UploadViewModels/TeamPhotoViewModel.cs b/League/Models/UploadViewModels/TeamPhotoViewModel.cs
index 2df1e69e..65a8be15 100644
--- a/League/Models/UploadViewModels/TeamPhotoViewModel.cs
+++ b/League/Models/UploadViewModels/TeamPhotoViewModel.cs
@@ -1,5 +1,4 @@
-using System;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 
 namespace League.Models.UploadViewModels;
 
diff --git a/League/Models/VenueViewModels/VenueEditModel.cs b/League/Models/VenueViewModels/VenueEditModel.cs
index 6ca6ead2..af1e1e17 100644
--- a/League/Models/VenueViewModels/VenueEditModel.cs
+++ b/League/Models/VenueViewModels/VenueEditModel.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 using Axuno.Tools.GeoSpatial;
 using League.Components;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
diff --git a/League/MultiTenancy/TenantLink.cs b/League/MultiTenancy/TenantLink.cs
index 24b7e7d5..cca209fc 100644
--- a/League/MultiTenancy/TenantLink.cs
+++ b/League/MultiTenancy/TenantLink.cs
@@ -3,10 +3,7 @@
 // Licensed under the MIT license.
 //
 
-using System.Collections.Generic;
 using System.ComponentModel;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
 using TournamentManager.MultiTenancy;
 
 namespace League.MultiTenancy;
diff --git a/League/MultiTenancy/TenantResolver.cs b/League/MultiTenancy/TenantResolver.cs
index 5812d1cf..b2879421 100644
--- a/League/MultiTenancy/TenantResolver.cs
+++ b/League/MultiTenancy/TenantResolver.cs
@@ -1,6 +1,4 @@
-using System;
-using League.Views;
-using Microsoft.AspNetCore.Http;
+using League.Views;
 using Microsoft.AspNetCore.Http.Extensions;
 using TournamentManager.MultiTenancy;
 
diff --git a/League/MultiTenancy/TenantUrlHelperExtensions.cs b/League/MultiTenancy/TenantUrlHelperExtensions.cs
index c5b88508..f4f05f1b 100644
--- a/League/MultiTenancy/TenantUrlHelperExtensions.cs
+++ b/League/MultiTenancy/TenantUrlHelperExtensions.cs
@@ -4,8 +4,6 @@
 //
 
 using League.Routing;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
 
 namespace League.MultiTenancy;
 
diff --git a/League/Routing/TenantRouteConstraint.cs b/League/Routing/TenantRouteConstraint.cs
index 2b44efdd..7dce5cfa 100644
--- a/League/Routing/TenantRouteConstraint.cs
+++ b/League/Routing/TenantRouteConstraint.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using League.MultiTenancy;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
+using League.MultiTenancy;
 using TournamentManager.MultiTenancy;
 
 namespace League.Routing;
diff --git a/League/TagHelpers/SiteAuthorizeResourceTagHelper.cs b/League/TagHelpers/SiteAuthorizeResourceTagHelper.cs
index c678e6fa..a4204c09 100644
--- a/League/TagHelpers/SiteAuthorizeResourceTagHelper.cs
+++ b/League/TagHelpers/SiteAuthorizeResourceTagHelper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace League.TagHelpers;
 // Similar to:
diff --git a/League/TagHelpers/SiteAuthorizeTagHelper.cs b/League/TagHelpers/SiteAuthorizeTagHelper.cs
index a2da85ab..a365ec0d 100644
--- a/League/TagHelpers/SiteAuthorizeTagHelper.cs
+++ b/League/TagHelpers/SiteAuthorizeTagHelper.cs
@@ -1,8 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Policy;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authorization.Policy;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace League.TagHelpers;
diff --git a/League/TagHelpers/SiteDescriptionTagHelper.cs b/League/TagHelpers/SiteDescriptionTagHelper.cs
index 7400ca1e..045669b7 100644
--- a/League/TagHelpers/SiteDescriptionTagHelper.cs
+++ b/League/TagHelpers/SiteDescriptionTagHelper.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
diff --git a/League/Templates/Email/TemplateName.cs b/League/Templates/Email/TemplateName.cs
index b93dc7f9..89809977 100644
--- a/League/Templates/Email/TemplateName.cs
+++ b/League/Templates/Email/TemplateName.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace League.Templates.Email;
+namespace League.Templates.Email;
 
 public static class TemplateName
 {
diff --git a/League/TextTemplatingModule/EmailTemplateDefinitionProvider.cs b/League/TextTemplatingModule/EmailTemplateDefinitionProvider.cs
index eacf3244..d72f14ff 100644
--- a/League/TextTemplatingModule/EmailTemplateDefinitionProvider.cs
+++ b/League/TextTemplatingModule/EmailTemplateDefinitionProvider.cs
@@ -1,5 +1,4 @@
 using Axuno.TextTemplating;
-using System.Globalization;
 using League.Templates.Email;
 using League.Templates.Email.Localization;
 
diff --git a/League/TextTemplatingModule/LeagueTemplateRenderer.cs b/League/TextTemplatingModule/LeagueTemplateRenderer.cs
index 49e93bf1..44b4798e 100644
--- a/League/TextTemplatingModule/LeagueTemplateRenderer.cs
+++ b/League/TextTemplatingModule/LeagueTemplateRenderer.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Axuno.TextTemplating;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
+using Axuno.TextTemplating;
 using Scriban;
 using Scriban.Parsing;
 using Scriban.Syntax;
diff --git a/League/TextTemplatingModule/NetDateFunctions.cs b/League/TextTemplatingModule/NetDateFunctions.cs
index 9ecde607..8e516d78 100644
--- a/League/TextTemplatingModule/NetDateFunctions.cs
+++ b/League/TextTemplatingModule/NetDateFunctions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Globalization;
-using System.Threading.Tasks;
-using Scriban;
+using Scriban;
 using Scriban.Runtime;
 using Scriban.Syntax;
 
diff --git a/League/TextTemplatingModule/TextTemplatingServiceCollectionExtensions.cs b/League/TextTemplatingModule/TextTemplatingServiceCollectionExtensions.cs
index 8b73ebd7..ce01e6d4 100644
--- a/League/TextTemplatingModule/TextTemplatingServiceCollectionExtensions.cs
+++ b/League/TextTemplatingModule/TextTemplatingServiceCollectionExtensions.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Globalization;
-using Axuno.TextTemplating;
+using Axuno.TextTemplating;
 using Axuno.TextTemplating.VirtualFiles;
 using Axuno.VirtualFileSystem;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
 
 namespace League.TextTemplatingModule;
 
diff --git a/League/Views/Match/Fixtures.cshtml b/League/Views/Match/Fixtures.cshtml
index a0620887..58761197 100644
--- a/League/Views/Match/Fixtures.cshtml
+++ b/League/Views/Match/Fixtures.cshtml
@@ -3,11 +3,10 @@
 @using TournamentManager.DAL.EntityClasses
 @using TournamentManager.DAL.TypedViewClasses
 @using TournamentManager.MultiTenancy
-@using League.MultiTenancy 
+@using League.MultiTenancy @* don't remove *@
 @using League.TagHelpers
 @using League.Views
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@* don't remove *@
 @inject IViewLocalizer Localizer
 @inject ITenantContext TenantContext
 @inject TenantLink TenantLink
diff --git a/README.md b/README.md
index 1a716b55..6e0ebcce 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Before running the `League.Demo` project for the first time, the MSSQL databases
 
 A backup of the two demo databases is located in `League.Demo/Seed/Demo-Db.zip`. Restore the databases to your local MSSQL Server (Express) instance. Then adjust the connection string for the server in `Credentials.Development.json`.
 
-The default database names are `TestOrg` and `OtherOrg`. You may change these names, but then update the `DbContest/Catalog` name in `Tenant.TestOrg.Development.config` and  `Tenant.OtherOrg.Development.config` accordingly.
+The default database names are `TestOrg` and `OtherOrg`. You may change these names, but then update the `DbContext/Catalog` name in `Tenant.TestOrg.Development.config` and  `Tenant.OtherOrg.Development.config` accordingly.
 
 ### Admin login
 
diff --git a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/CompletedMatchRow.cs b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/CompletedMatchRow.cs
index 1c87bcfb..710e78ad 100644
--- a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/CompletedMatchRow.cs
+++ b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/CompletedMatchRow.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Xml.Serialization;
 
 namespace TournamentManager.DAL.TypedViewClasses;
diff --git a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/SetEntity.cs b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/SetEntity.cs
index 46fdc0c8..d69369ff 100644
--- a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/SetEntity.cs
+++ b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/SetEntity.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.CompilerServices;
 using TournamentManager.DAL.HelperClasses;
 
 #if !CF
diff --git a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/TeamEntity.cs b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/TeamEntity.cs
index bf989fdc..d23950b5 100644
--- a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/TeamEntity.cs
+++ b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/TeamEntity.cs
@@ -1,7 +1,6 @@
 using System;
 #if !CF
 #endif
-using System.Linq;
 using TournamentManager.DAL.HelperClasses;
 
 namespace TournamentManager.DAL.EntityClasses;
diff --git a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/UserEntity.cs b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/UserEntity.cs
index 17a5e201..598cf4d1 100644
--- a/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/UserEntity.cs
+++ b/TournamentManager/DAL/DatabaseGeneric/CustomExtensions/UserEntity.cs
@@ -6,7 +6,6 @@
 #endif
 using System.Xml.Serialization;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using TournamentManager.DAL.HelperClasses;
 
 namespace TournamentManager.DAL.EntityClasses;
diff --git a/TournamentManager/TournamentManager.Tests/DateTimePeriodTest.cs b/TournamentManager/TournamentManager.Tests/DateTimePeriodTest.cs
index 2ce0a3df..42be3490 100644
--- a/TournamentManager/TournamentManager.Tests/DateTimePeriodTest.cs
+++ b/TournamentManager/TournamentManager.Tests/DateTimePeriodTest.cs
@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace TournamentManager.Tests;
 
diff --git a/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchEntityExtensionTests.cs b/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchEntityExtensionTests.cs
index b2223874..36374251 100644
--- a/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchEntityExtensionTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchEntityExtensionTests.cs
@@ -1,12 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
+using NUnit.Framework;
 using FluentAssertions;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ExtensionMethods;
-using TournamentManager.ModelValidators;
-using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.Tests.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchRuleEntityExtensionTests.cs b/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchRuleEntityExtensionTests.cs
index db79500e..15ee4c56 100644
--- a/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchRuleEntityExtensionTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ExtensionMethods/MatchRuleEntityExtensionTests.cs
@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 
 namespace TournamentManager.Tests.ExtensionMethods;
diff --git a/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityExtensionTests.cs b/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityExtensionTests.cs
index dd3aecd6..c4fcd346 100644
--- a/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityExtensionTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityExtensionTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityListExtensionTests.cs b/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityListExtensionTests.cs
index 0840e399..bc36bb8f 100644
--- a/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityListExtensionTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ExtensionMethods/SetEntityListExtensionTests.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager.Tests/ExtensionMethods/TimeSpanExtensionTests.cs b/TournamentManager/TournamentManager.Tests/ExtensionMethods/TimeSpanExtensionTests.cs
index fa11ccad..945c0817 100644
--- a/TournamentManager/TournamentManager.Tests/ExtensionMethods/TimeSpanExtensionTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ExtensionMethods/TimeSpanExtensionTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.ExtensionMethods;
 
 namespace TournamentManager.Tests.ExtensionMethods;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/FixtureValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/FixtureValidatorTests.cs
index 0faa24e7..4a1d76c2 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/FixtureValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/FixtureValidatorTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Globalization;
 using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultPermissionValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultPermissionValidatorTests.cs
index 986576ad..9d38690d 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultPermissionValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultPermissionValidatorTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultValidatorTests.cs
index 5dfdd377..c25adb05 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/MatchResultValidatorTests.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Moq;
+using Moq;
 using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.Data;
-using TournamentManager.ExtensionMethods;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
 using TournamentManager.Tests.TestComponents;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/SetsValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/SetsValidatorTests.cs
index e7af6aff..77639ca9 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/SetsValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/SetsValidatorTests.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/SingleSetValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/SingleSetValidatorTests.cs
index 0a5ad2aa..f0332931 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/SingleSetValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/SingleSetValidatorTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamInRoundValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamInRoundValidatorTests.cs
index 63c13328..e25e468c 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamInRoundValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamInRoundValidatorTests.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.Data;
 using TournamentManager.ModelValidators;
 using Moq;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.HelperClasses;
-using TournamentManager.ExtensionMethods;
 using TournamentManager.MultiTenancy;
 using TournamentManager.Tests.TestComponents;
 
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
index 69703a24..77343631 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ModelValidators;
 using Moq;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/ValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/ValidatorTests.cs
index b597dfef..d37099ba 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/ValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/ValidatorTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
+using NUnit.Framework;
 using TournamentManager.ModelValidators;
 
 namespace TournamentManager.Tests.ModelValidators;
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/VenueValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/VenueValidatorTests.cs
index 5b2f27c4..c9064a8d 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/VenueValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/VenueValidatorTests.cs
@@ -1,21 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
+using System.Globalization;
 using Axuno.Tools.GeoSpatial;
 using NUnit.Framework;
 using TournamentManager.DAL.EntityClasses;
-using TournamentManager.Data;
 using TournamentManager.ModelValidators;
-using Moq;
-using SD.LLBLGen.Pro.ORMSupportClasses;
-using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.TypedViewClasses;
-using TournamentManager.ExtensionMethods;
-using TournamentManager.Tests.TestComponents;
 
 namespace TournamentManager.Tests.ModelValidators;
 
diff --git a/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantConfigWatcherTests.cs b/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantConfigWatcherTests.cs
index fe77cb18..e02e3368 100644
--- a/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantConfigWatcherTests.cs
+++ b/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantConfigWatcherTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Abstractions;
 using NUnit.Framework;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantStoreTests.cs b/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantStoreTests.cs
index 57671a37..b2050a2f 100644
--- a/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantStoreTests.cs
+++ b/TournamentManager/TournamentManager.Tests/MultiTenancy/TenantStoreTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
diff --git a/TournamentManager/TournamentManager.Tests/PointResultTests.cs b/TournamentManager/TournamentManager.Tests/PointResultTests.cs
index 4acca233..391356ec 100644
--- a/TournamentManager/TournamentManager.Tests/PointResultTests.cs
+++ b/TournamentManager/TournamentManager.Tests/PointResultTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 
 namespace TournamentManager.Tests;
diff --git a/TournamentManager/TournamentManager.Tests/TestComponents/MockExtensions.cs b/TournamentManager/TournamentManager.Tests/TestComponents/MockExtensions.cs
index 09001032..e33d203b 100644
--- a/TournamentManager/TournamentManager.Tests/TestComponents/MockExtensions.cs
+++ b/TournamentManager/TournamentManager.Tests/TestComponents/MockExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Moq;
+using Moq;
 using Moq.Language.Flow;
 using TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLogger.cs b/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLogger.cs
index b51f3c83..f53c0e37 100644
--- a/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLogger.cs
+++ b/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLogger.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Text;
-using System.Threading;
 using Microsoft.Extensions.Logging;
 
 namespace TournamentManager.Tests.TestComponents;
diff --git a/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLoggerOfT.cs b/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLoggerOfT.cs
index 2b91e393..40d7b4c9 100644
--- a/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLoggerOfT.cs
+++ b/TournamentManager/TournamentManager.Tests/TestComponents/NUnitLoggerOfT.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace TournamentManager.Tests.TestComponents;
 
diff --git a/TournamentManager/TournamentManager.Tests/TestComponents/TestMocks.cs b/TournamentManager/TournamentManager.Tests/TestComponents/TestMocks.cs
index c7e3b9f3..7d08a15f 100644
--- a/TournamentManager/TournamentManager.Tests/TestComponents/TestMocks.cs
+++ b/TournamentManager/TournamentManager.Tests/TestComponents/TestMocks.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Moq;
-using Moq.Language.Flow;
+using Moq;
 using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.Tests.TestComponents;
diff --git a/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj b/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj
index 18fcde02..c4012d6e 100644
--- a/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj
+++ b/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <NeutralLanguage>en</NeutralLanguage>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/TournamentManager/TournamentManager/DI/PhoneNumberService.cs b/TournamentManager/TournamentManager/DI/PhoneNumberService.cs
index 7aa5125d..035ecafb 100644
--- a/TournamentManager/TournamentManager/DI/PhoneNumberService.cs
+++ b/TournamentManager/TournamentManager/DI/PhoneNumberService.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using PhoneNumbers;
 
 namespace TournamentManager.DI;
diff --git a/TournamentManager/TournamentManager/Data/AvailableMatchDateRepository.cs b/TournamentManager/TournamentManager/Data/AvailableMatchDateRepository.cs
index 33f1a94d..b6b52b2f 100644
--- a/TournamentManager/TournamentManager/Data/AvailableMatchDateRepository.cs
+++ b/TournamentManager/TournamentManager/Data/AvailableMatchDateRepository.cs
@@ -1,19 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
-using SD.LLBLGen.Pro.QuerySpec;
-using SD.LLBLGen.Pro.QuerySpec.Adapter;
-using TournamentManager.DAL.DatabaseSpecific;
 using TournamentManager.DAL.EntityClasses;
-using TournamentManager.DAL.FactoryClasses;
 using TournamentManager.DAL.HelperClasses;
-using TournamentManager.DAL.Linq;
-using TournamentManager.DAL.TypedViewClasses;
 
 namespace TournamentManager.Data;
 
diff --git a/TournamentManager/TournamentManager/Data/ExcludedMatchDateRepository.cs b/TournamentManager/TournamentManager/Data/ExcludedMatchDateRepository.cs
index b25b29d3..8aa8170d 100644
--- a/TournamentManager/TournamentManager/Data/ExcludedMatchDateRepository.cs
+++ b/TournamentManager/TournamentManager/Data/ExcludedMatchDateRepository.cs
@@ -1,19 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using SD.LLBLGen.Pro.QuerySpec.Adapter;
-using TournamentManager.DAL.DatabaseSpecific;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.FactoryClasses;
 using TournamentManager.DAL.HelperClasses;
-using TournamentManager.DAL.Linq;
-using TournamentManager.DAL.TypedViewClasses;
 
 namespace TournamentManager.Data;
 
diff --git a/TournamentManager/TournamentManager/Data/GenericRepository.cs b/TournamentManager/TournamentManager/Data/GenericRepository.cs
index 6a6b904f..c83521e8 100644
--- a/TournamentManager/TournamentManager/Data/GenericRepository.cs
+++ b/TournamentManager/TournamentManager/Data/GenericRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Data;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Data;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 
diff --git a/TournamentManager/TournamentManager/Data/ManagerOfTeamRepository.cs b/TournamentManager/TournamentManager/Data/ManagerOfTeamRepository.cs
index 90473a78..3690ea68 100644
--- a/TournamentManager/TournamentManager/Data/ManagerOfTeamRepository.cs
+++ b/TournamentManager/TournamentManager/Data/ManagerOfTeamRepository.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
@@ -11,7 +5,6 @@
 using SD.LLBLGen.Pro.QuerySpec.Adapter;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.FactoryClasses;
-using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
 
 namespace TournamentManager.Data;
diff --git a/TournamentManager/TournamentManager/Data/MatchRepository.cs b/TournamentManager/TournamentManager/Data/MatchRepository.cs
index c99713ab..acacf3b6 100644
--- a/TournamentManager/TournamentManager/Data/MatchRepository.cs
+++ b/TournamentManager/TournamentManager/Data/MatchRepository.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/TournamentManager/TournamentManager/Data/PlayerInTeamRepository.cs b/TournamentManager/TournamentManager/Data/PlayerInTeamRepository.cs
index 29c701dc..13c0cd32 100644
--- a/TournamentManager/TournamentManager/Data/PlayerInTeamRepository.cs
+++ b/TournamentManager/TournamentManager/Data/PlayerInTeamRepository.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using TournamentManager.DAL.EntityClasses;
diff --git a/TournamentManager/TournamentManager/Data/RankingRepository.cs b/TournamentManager/TournamentManager/Data/RankingRepository.cs
index 34a5b200..5531fb6d 100644
--- a/TournamentManager/TournamentManager/Data/RankingRepository.cs
+++ b/TournamentManager/TournamentManager/Data/RankingRepository.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/TournamentManager/TournamentManager/Data/RoleRepository.cs b/TournamentManager/TournamentManager/Data/RoleRepository.cs
index 4ae5bee8..8ba73da7 100644
--- a/TournamentManager/TournamentManager/Data/RoleRepository.cs
+++ b/TournamentManager/TournamentManager/Data/RoleRepository.cs
@@ -1,15 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
-using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
-using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
 
 namespace TournamentManager.Data;
diff --git a/TournamentManager/TournamentManager/Data/RoundRepository.cs b/TournamentManager/TournamentManager/Data/RoundRepository.cs
index 142e04b7..1bfa44d0 100644
--- a/TournamentManager/TournamentManager/Data/RoundRepository.cs
+++ b/TournamentManager/TournamentManager/Data/RoundRepository.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
-using SD.LLBLGen.Pro.LinqSupportClasses.PrefetchPathAPI;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using SD.LLBLGen.Pro.QuerySpec.Adapter;
diff --git a/TournamentManager/TournamentManager/Data/TeamInRoundRepository.cs b/TournamentManager/TournamentManager/Data/TeamInRoundRepository.cs
index aa2fbdee..8062fe6d 100644
--- a/TournamentManager/TournamentManager/Data/TeamInRoundRepository.cs
+++ b/TournamentManager/TournamentManager/Data/TeamInRoundRepository.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using SD.LLBLGen.Pro.QuerySpec.Adapter;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.FactoryClasses;
 using TournamentManager.DAL.HelperClasses;
-using TournamentManager.DAL.Linq;
 
 namespace TournamentManager.Data;
 
diff --git a/TournamentManager/TournamentManager/Data/TeamRespository.cs b/TournamentManager/TournamentManager/Data/TeamRespository.cs
index fd2da5a2..1cd056f0 100644
--- a/TournamentManager/TournamentManager/Data/TeamRespository.cs
+++ b/TournamentManager/TournamentManager/Data/TeamRespository.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using SD.LLBLGen.Pro.LinqSupportClasses;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using SD.LLBLGen.Pro.QuerySpec;
 using SD.LLBLGen.Pro.QuerySpec.Adapter;
@@ -14,7 +7,6 @@
 using TournamentManager.DAL.FactoryClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
-using TournamentManager.DAL.RelationClasses;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace TournamentManager.Data;
diff --git a/TournamentManager/TournamentManager/Data/TournamentRepository.cs b/TournamentManager/TournamentManager/Data/TournamentRepository.cs
index 17205868..6d6ab1ea 100644
--- a/TournamentManager/TournamentManager/Data/TournamentRepository.cs
+++ b/TournamentManager/TournamentManager/Data/TournamentRepository.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
@@ -13,8 +8,6 @@
 using TournamentManager.DAL.FactoryClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
-using TournamentManager.DAL.RelationClasses;
-using TournamentManager.DAL.TypedViewClasses;
 
 namespace TournamentManager.Data;
 
diff --git a/TournamentManager/TournamentManager/Data/UserClaimRepository.cs b/TournamentManager/TournamentManager/Data/UserClaimRepository.cs
index a64ff1bd..4349286b 100644
--- a/TournamentManager/TournamentManager/Data/UserClaimRepository.cs
+++ b/TournamentManager/TournamentManager/Data/UserClaimRepository.cs
@@ -1,15 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
-using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
-using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
 
 namespace TournamentManager.Data;
diff --git a/TournamentManager/TournamentManager/Data/UserLoginRepository.cs b/TournamentManager/TournamentManager/Data/UserLoginRepository.cs
index e9a6bb23..ca78ff97 100644
--- a/TournamentManager/TournamentManager/Data/UserLoginRepository.cs
+++ b/TournamentManager/TournamentManager/Data/UserLoginRepository.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
diff --git a/TournamentManager/TournamentManager/Data/UserRepository.cs b/TournamentManager/TournamentManager/Data/UserRepository.cs
index 01ed0643..1e4723ee 100644
--- a/TournamentManager/TournamentManager/Data/UserRepository.cs
+++ b/TournamentManager/TournamentManager/Data/UserRepository.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/TournamentManager/TournamentManager/Data/UserRoleRepository.cs b/TournamentManager/TournamentManager/Data/UserRoleRepository.cs
index 8bec31e5..07ede39b 100644
--- a/TournamentManager/TournamentManager/Data/UserRoleRepository.cs
+++ b/TournamentManager/TournamentManager/Data/UserRoleRepository.cs
@@ -1,15 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
-using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
-using TournamentManager.DAL.HelperClasses;
 using TournamentManager.DAL.Linq;
 
 namespace TournamentManager.Data;
diff --git a/TournamentManager/TournamentManager/Data/UserTokenRepository.cs b/TournamentManager/TournamentManager/Data/UserTokenRepository.cs
index f3718af7..57ae05aa 100644
--- a/TournamentManager/TournamentManager/Data/UserTokenRepository.cs
+++ b/TournamentManager/TournamentManager/Data/UserTokenRepository.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.Linq;
diff --git a/TournamentManager/TournamentManager/Data/VenueRepository.cs b/TournamentManager/TournamentManager/Data/VenueRepository.cs
index b4fdd867..929059a9 100644
--- a/TournamentManager/TournamentManager/Data/VenueRepository.cs
+++ b/TournamentManager/TournamentManager/Data/VenueRepository.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SD.LLBLGen.Pro.LinqSupportClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
diff --git a/TournamentManager/TournamentManager/DateTimePeriod.cs b/TournamentManager/TournamentManager/DateTimePeriod.cs
index 24ce5e0e..b2543688 100644
--- a/TournamentManager/TournamentManager/DateTimePeriod.cs
+++ b/TournamentManager/TournamentManager/DateTimePeriod.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
-using TournamentManager.DAL.Linq;
-using TournamentManager.Data;
-
 namespace TournamentManager;
 
 public class DateTimePeriod
diff --git a/TournamentManager/TournamentManager/ExtensionMethods/EntityCoreExtensions.cs b/TournamentManager/TournamentManager/ExtensionMethods/EntityCoreExtensions.cs
index 4a5c0a06..2b3e212c 100644
--- a/TournamentManager/TournamentManager/ExtensionMethods/EntityCoreExtensions.cs
+++ b/TournamentManager/TournamentManager/ExtensionMethods/EntityCoreExtensions.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 
 namespace TournamentManager.ExtensionMethods;
diff --git a/TournamentManager/TournamentManager/ExtensionMethods/MatchEntityExtensions.cs b/TournamentManager/TournamentManager/ExtensionMethods/MatchEntityExtensions.cs
index cb0eb6f6..e71b12bd 100644
--- a/TournamentManager/TournamentManager/ExtensionMethods/MatchEntityExtensions.cs
+++ b/TournamentManager/TournamentManager/ExtensionMethods/MatchEntityExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 
 namespace TournamentManager.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager/ExtensionMethods/SetEntityExtensions.cs b/TournamentManager/TournamentManager/ExtensionMethods/SetEntityExtensions.cs
index 89df3339..6ba31197 100644
--- a/TournamentManager/TournamentManager/ExtensionMethods/SetEntityExtensions.cs
+++ b/TournamentManager/TournamentManager/ExtensionMethods/SetEntityExtensions.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 
 namespace TournamentManager.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager/ExtensionMethods/SetEntityListExtensions.cs b/TournamentManager/TournamentManager/ExtensionMethods/SetEntityListExtensions.cs
index 7bf79e62..c5c59c86 100644
--- a/TournamentManager/TournamentManager/ExtensionMethods/SetEntityListExtensions.cs
+++ b/TournamentManager/TournamentManager/ExtensionMethods/SetEntityListExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using TournamentManager.DAL.EntityClasses;
-using TournamentManager.Match;
+using TournamentManager.DAL.EntityClasses;
 
 namespace TournamentManager.ExtensionMethods;
 
diff --git a/TournamentManager/TournamentManager/ExtensionMethods/TimeSpanExtensions.cs b/TournamentManager/TournamentManager/ExtensionMethods/TimeSpanExtensions.cs
index c2986754..1de9264b 100644
--- a/TournamentManager/TournamentManager/ExtensionMethods/TimeSpanExtensions.cs
+++ b/TournamentManager/TournamentManager/ExtensionMethods/TimeSpanExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace TournamentManager.ExtensionMethods;
+namespace TournamentManager.ExtensionMethods;
 
 public static class TimeSpanExtensions
 {
diff --git a/TournamentManager/TournamentManager/Importers/ExcludedDates/EnumberableExtensions.cs b/TournamentManager/TournamentManager/Importers/ExcludedDates/EnumberableExtensions.cs
index e2539d42..946db13d 100644
--- a/TournamentManager/TournamentManager/Importers/ExcludedDates/EnumberableExtensions.cs
+++ b/TournamentManager/TournamentManager/Importers/ExcludedDates/EnumberableExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace TournamentManager.Importers.ExcludedDates;
+namespace TournamentManager.Importers.ExcludedDates;
 
 public static class EnumerableExtensions
 {
diff --git a/TournamentManager/TournamentManager/Importers/ExcludedDates/ExcelImporter.cs b/TournamentManager/TournamentManager/Importers/ExcludedDates/ExcelImporter.cs
index 83093132..d5406941 100644
--- a/TournamentManager/TournamentManager/Importers/ExcludedDates/ExcelImporter.cs
+++ b/TournamentManager/TournamentManager/Importers/ExcludedDates/ExcelImporter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Extensions.Logging;
-using NodaTime;
+using Microsoft.Extensions.Logging;
 using OfficeOpenXml;
 using TournamentManager.DAL.EntityClasses;
 
diff --git a/TournamentManager/TournamentManager/Importers/ExcludedDates/GermanHolidayImporter.cs b/TournamentManager/TournamentManager/Importers/ExcludedDates/GermanHolidayImporter.cs
index 22ad0279..ddee7979 100644
--- a/TournamentManager/TournamentManager/Importers/ExcludedDates/GermanHolidayImporter.cs
+++ b/TournamentManager/TournamentManager/Importers/ExcludedDates/GermanHolidayImporter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using TournamentManager.DAL.EntityClasses;
 
 namespace TournamentManager.Importers.ExcludedDates;
diff --git a/TournamentManager/TournamentManager/Importers/ExcludedDates/InternetCalendarImporter.cs b/TournamentManager/TournamentManager/Importers/ExcludedDates/InternetCalendarImporter.cs
index 3dad40dd..72f09828 100644
--- a/TournamentManager/TournamentManager/Importers/ExcludedDates/InternetCalendarImporter.cs
+++ b/TournamentManager/TournamentManager/Importers/ExcludedDates/InternetCalendarImporter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
 
 namespace TournamentManager.Importers.ExcludedDates;
diff --git a/TournamentManager/TournamentManager/Match/Calendar.cs b/TournamentManager/TournamentManager/Match/Calendar.cs
index b25343e1..d8c75fa7 100644
--- a/TournamentManager/TournamentManager/Match/Calendar.cs
+++ b/TournamentManager/TournamentManager/Match/Calendar.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.Text;
 using Ical.Net;
 using Ical.Net.CalendarComponents;
 using Ical.Net.DataTypes;
diff --git a/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs b/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
index f09d5ff5..9321a045 100644
--- a/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace TournamentManager.ModelValidators;
 
diff --git a/TournamentManager/TournamentManager/ModelValidators/FixtureValidator.cs b/TournamentManager/TournamentManager/ModelValidators/FixtureValidator.cs
index b328e69f..05c8caac 100644
--- a/TournamentManager/TournamentManager/ModelValidators/FixtureValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/FixtureValidator.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using System.ComponentModel;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL;
 using TournamentManager.DAL.EntityClasses;
diff --git a/TournamentManager/TournamentManager/ModelValidators/MatchResultPermissionValidator.cs b/TournamentManager/TournamentManager/ModelValidators/MatchResultPermissionValidator.cs
index 4e6b2387..4bc293fc 100644
--- a/TournamentManager/TournamentManager/ModelValidators/MatchResultPermissionValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/MatchResultPermissionValidator.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager/ModelValidators/MatchResultValidator.cs b/TournamentManager/TournamentManager/ModelValidators/MatchResultValidator.cs
index 97c58fd3..ef6a7700 100644
--- a/TournamentManager/TournamentManager/ModelValidators/MatchResultValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/MatchResultValidator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ExtensionMethods;
 using TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/ModelValidators/PhoneNumberValidator.cs b/TournamentManager/TournamentManager/ModelValidators/PhoneNumberValidator.cs
index 7c2aedcc..8e2bb49f 100644
--- a/TournamentManager/TournamentManager/ModelValidators/PhoneNumberValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/PhoneNumberValidator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Threading.Tasks;
+using System.Globalization;
 using TournamentManager.DI;
 
 namespace TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager/ModelValidators/SetsValidator.cs b/TournamentManager/TournamentManager/ModelValidators/SetsValidator.cs
index 4cb23ec8..3279ca03 100644
--- a/TournamentManager/TournamentManager/ModelValidators/SetsValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/SetsValidator.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using TournamentManager.DAL.EntityClasses;
-using TournamentManager.ExtensionMethods;
-using TournamentManager.Match;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager/ModelValidators/SingleSetValidator.cs b/TournamentManager/TournamentManager/ModelValidators/SingleSetValidator.cs
index 58ac45d3..566c2abf 100644
--- a/TournamentManager/TournamentManager/ModelValidators/SingleSetValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/SingleSetValidator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamInRoundValidator.cs b/TournamentManager/TournamentManager/ModelValidators/TeamInRoundValidator.cs
index 5834ffcf..6bc842cb 100644
--- a/TournamentManager/TournamentManager/ModelValidators/TeamInRoundValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamInRoundValidator.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
-using TournamentManager.ExtensionMethods;
 using TournamentManager.MultiTenancy;
 
 namespace TournamentManager.ModelValidators;
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs b/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
index d209523d..91cfa4a6 100644
--- a/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TournamentManager.DAL.EntityClasses;
+using TournamentManager.DAL.EntityClasses;
 using TournamentManager.ExtensionMethods;
 using TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/ModelValidators/VenueValidator.cs b/TournamentManager/TournamentManager/ModelValidators/VenueValidator.cs
index 450b40e0..19e9fb63 100644
--- a/TournamentManager/TournamentManager/ModelValidators/VenueValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/VenueValidator.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Axuno.Tools.GeoSpatial;
+using Axuno.Tools.GeoSpatial;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.TypedViewClasses;
-using TournamentManager.Data;
-using TournamentManager.ExtensionMethods;
 
 namespace TournamentManager.ModelValidators;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/AbstractTenantStore.cs b/TournamentManager/TournamentManager/MultiTenancy/AbstractTenantStore.cs
index 424ee8f6..7e5d7641 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/AbstractTenantStore.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/AbstractTenantStore.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/DbContext.cs b/TournamentManager/TournamentManager/MultiTenancy/DbContext.cs
index b4e8ec04..d1672e97 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/DbContext.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/DbContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.DatabaseSpecific;
 
 namespace TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager/MultiTenancy/IDbContext.cs b/TournamentManager/TournamentManager/MultiTenancy/IDbContext.cs
index 1fc1b65a..ddf00321 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/IDbContext.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/IDbContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 
 namespace TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/ITenant.cs b/TournamentManager/TournamentManager/MultiTenancy/ITenant.cs
index 6d75dda1..6423192f 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/ITenant.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/ITenant.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace TournamentManager.MultiTenancy;
+namespace TournamentManager.MultiTenancy;
 
 /// <summary>
 /// Interface for tenant specific data.
diff --git a/TournamentManager/TournamentManager/MultiTenancy/ITenantStore.cs b/TournamentManager/TournamentManager/MultiTenancy/ITenantStore.cs
index 341b9870..d794c093 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/ITenantStore.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/ITenantStore.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 
 namespace TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/ITournamentContext.cs b/TournamentManager/TournamentManager/MultiTenancy/ITournamentContext.cs
index c3165111..edb83358 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/ITournamentContext.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/ITournamentContext.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace TournamentManager.MultiTenancy;
+namespace TournamentManager.MultiTenancy;
 
 /// <summary>
 /// The class contains all configuration data for a tournament.
diff --git a/TournamentManager/TournamentManager/MultiTenancy/TenantConfigWatcher.cs b/TournamentManager/TournamentManager/MultiTenancy/TenantConfigWatcher.cs
index 9b892fdb..3010a732 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/TenantConfigWatcher.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/TenantConfigWatcher.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Axuno.Tools.FileSystem;
+using Axuno.Tools.FileSystem;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Primitives;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/TenantContext.cs b/TournamentManager/TournamentManager/MultiTenancy/TenantContext.cs
index e1dddfba..66538bc2 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/TenantContext.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/TenantContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-#nullable enable
+#nullable enable
 
 namespace TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/MultiTenancy/TenantStore.cs b/TournamentManager/TournamentManager/MultiTenancy/TenantStore.cs
index a1ca5828..27f66d89 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/TenantStore.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/TenantStore.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager/MultiTenancy/TournamentContext.cs b/TournamentManager/TournamentManager/MultiTenancy/TournamentContext.cs
index 1a78b947..fbd07324 100644
--- a/TournamentManager/TournamentManager/MultiTenancy/TournamentContext.cs
+++ b/TournamentManager/TournamentManager/MultiTenancy/TournamentContext.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/Plan/AvailableMatchDates.cs b/TournamentManager/TournamentManager/Plan/AvailableMatchDates.cs
index dcd33e0b..4be8144a 100644
--- a/TournamentManager/TournamentManager/Plan/AvailableMatchDates.cs
+++ b/TournamentManager/TournamentManager/Plan/AvailableMatchDates.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using TournamentManager.Data;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager/Plan/CombinationGroupOptimizer.cs b/TournamentManager/TournamentManager/Plan/CombinationGroupOptimizer.cs
index 6e29d86c..3daa27ae 100644
--- a/TournamentManager/TournamentManager/Plan/CombinationGroupOptimizer.cs
+++ b/TournamentManager/TournamentManager/Plan/CombinationGroupOptimizer.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
 namespace TournamentManager.Plan;
diff --git a/TournamentManager/TournamentManager/Plan/MatchPlanner.cs b/TournamentManager/TournamentManager/Plan/MatchPlanner.cs
index 49af46f3..3a75e37c 100644
--- a/TournamentManager/TournamentManager/Plan/MatchPlanner.cs
+++ b/TournamentManager/TournamentManager/Plan/MatchPlanner.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using TournamentManager.DAL;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
 using SD.LLBLGen.Pro.ORMSupportClasses;
 using System.Collections.ObjectModel;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using TournamentManager.MultiTenancy;
 
diff --git a/TournamentManager/TournamentManager/Plan/RoundRobinSystem.cs b/TournamentManager/TournamentManager/Plan/RoundRobinSystem.cs
index 80d4912e..21d2a55e 100644
--- a/TournamentManager/TournamentManager/Plan/RoundRobinSystem.cs
+++ b/TournamentManager/TournamentManager/Plan/RoundRobinSystem.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
 namespace TournamentManager.Plan;
diff --git a/TournamentManager/TournamentManager/Plan/TeamCombinationGroup.cs b/TournamentManager/TournamentManager/Plan/TeamCombinationGroup.cs
index e36edb9c..20833217 100644
--- a/TournamentManager/TournamentManager/Plan/TeamCombinationGroup.cs
+++ b/TournamentManager/TournamentManager/Plan/TeamCombinationGroup.cs
@@ -1,5 +1,4 @@
 using System.Collections.ObjectModel;
-using TournamentManager.Data;
 
 namespace TournamentManager.Plan;
 
diff --git a/TournamentManager/TournamentManager/Plan/enumClearMatchDates.cs b/TournamentManager/TournamentManager/Plan/enumClearMatchDates.cs
index 6479ff28..edf7f4fc 100644
--- a/TournamentManager/TournamentManager/Plan/enumClearMatchDates.cs
+++ b/TournamentManager/TournamentManager/Plan/enumClearMatchDates.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace TournamentManager.Plan;
 
 [Flags]
diff --git a/TournamentManager/TournamentManager/PointResult.cs b/TournamentManager/TournamentManager/PointResult.cs
index bac86f30..987ac1ce 100644
--- a/TournamentManager/TournamentManager/PointResult.cs
+++ b/TournamentManager/TournamentManager/PointResult.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace TournamentManager;
 
 /// <summary>
diff --git a/TournamentManager/TournamentManager/Ranking/AlternateRankComparer1.cs b/TournamentManager/TournamentManager/Ranking/AlternateRankComparer1.cs
index 642772cb..a13facbd 100644
--- a/TournamentManager/TournamentManager/Ranking/AlternateRankComparer1.cs
+++ b/TournamentManager/TournamentManager/Ranking/AlternateRankComparer1.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace TournamentManager.Ranking;
 
 /// <summary>
diff --git a/TournamentManager/TournamentManager/Ranking/AlternateRankComparer2.cs b/TournamentManager/TournamentManager/Ranking/AlternateRankComparer2.cs
index 2556845e..b5987dff 100644
--- a/TournamentManager/TournamentManager/Ranking/AlternateRankComparer2.cs
+++ b/TournamentManager/TournamentManager/Ranking/AlternateRankComparer2.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace TournamentManager.Ranking;
 
 /// <summary>
diff --git a/TournamentManager/TournamentManager/Ranking/IRankComparer.cs b/TournamentManager/TournamentManager/Ranking/IRankComparer.cs
index aa04258a..c020d1de 100644
--- a/TournamentManager/TournamentManager/Ranking/IRankComparer.cs
+++ b/TournamentManager/TournamentManager/Ranking/IRankComparer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace TournamentManager.Ranking;
+namespace TournamentManager.Ranking;
 
 internal interface IRankComparer : IComparer<Rank>
 {
diff --git a/TournamentManager/TournamentManager/Ranking/Rank.cs b/TournamentManager/TournamentManager/Ranking/Rank.cs
index c6215f92..47bf289a 100644
--- a/TournamentManager/TournamentManager/Ranking/Rank.cs
+++ b/TournamentManager/TournamentManager/Ranking/Rank.cs
@@ -1,6 +1,3 @@
-using TournamentManager.DAL.EntityClasses;
-using TournamentManager.Match;
-
 namespace TournamentManager.Ranking;
 
 /// <summary>
diff --git a/TournamentManager/TournamentManager/Ranking/RankComparerEnum.cs b/TournamentManager/TournamentManager/Ranking/RankComparerEnum.cs
index ebe82f29..6c560892 100644
--- a/TournamentManager/TournamentManager/Ranking/RankComparerEnum.cs
+++ b/TournamentManager/TournamentManager/Ranking/RankComparerEnum.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TournamentManager.Ranking;
+namespace TournamentManager.Ranking;
 
 public enum RankComparerEnum
 {
diff --git a/TournamentManager/TournamentManager/Ranking/Ranking.cs b/TournamentManager/TournamentManager/Ranking/Ranking.cs
index 9321b446..97d372e6 100644
--- a/TournamentManager/TournamentManager/Ranking/Ranking.cs
+++ b/TournamentManager/TournamentManager/Ranking/Ranking.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using TournamentManager.DAL.TypedViewClasses;
 
 namespace TournamentManager.Ranking;
diff --git a/TournamentManager/TournamentManager/Ranking/RankingChart.cs b/TournamentManager/TournamentManager/Ranking/RankingChart.cs
index 8c7b1dff..abdde8ef 100644
--- a/TournamentManager/TournamentManager/Ranking/RankingChart.cs
+++ b/TournamentManager/TournamentManager/Ranking/RankingChart.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using OxyPlot;
 using OxyPlot.Annotations;
 using OxyPlot.Axes;
diff --git a/TournamentManager/TournamentManager/Ranking/RankingHistory.cs b/TournamentManager/TournamentManager/Ranking/RankingHistory.cs
index d8b46b2f..4167a137 100644
--- a/TournamentManager/TournamentManager/Ranking/RankingHistory.cs
+++ b/TournamentManager/TournamentManager/Ranking/RankingHistory.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using TournamentManager.DAL.EntityClasses;
-
-
 namespace TournamentManager.Ranking;
 
 public class RankingHistory
diff --git a/TournamentManager/TournamentManager/Ranking/RankingList.cs b/TournamentManager/TournamentManager/Ranking/RankingList.cs
index 22304622..f3d3abf8 100644
--- a/TournamentManager/TournamentManager/Ranking/RankingList.cs
+++ b/TournamentManager/TournamentManager/Ranking/RankingList.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace TournamentManager.Ranking;
 
 public class RankingList : List<Rank>
diff --git a/TournamentManager/TournamentManager/Ranking/RankingTeamHistory.cs b/TournamentManager/TournamentManager/Ranking/RankingTeamHistory.cs
index 2e5ca263..6b6c8b3a 100644
--- a/TournamentManager/TournamentManager/Ranking/RankingTeamHistory.cs
+++ b/TournamentManager/TournamentManager/Ranking/RankingTeamHistory.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace TournamentManager.Ranking;
 
 public class RankingTeamHistory : Dictionary<DateTime, Rank>
diff --git a/TournamentManager/TournamentManager/Ranking/StandardRankComparer.cs b/TournamentManager/TournamentManager/Ranking/StandardRankComparer.cs
index 7852b2c5..6b3bd9f9 100644
--- a/TournamentManager/TournamentManager/Ranking/StandardRankComparer.cs
+++ b/TournamentManager/TournamentManager/Ranking/StandardRankComparer.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace TournamentManager.Ranking;
 
 /// <summary>
diff --git a/TournamentManager/TournamentManager/TournamentCreator.cs b/TournamentManager/TournamentManager/TournamentCreator.cs
index 104427c3..35ee7eeb 100644
--- a/TournamentManager/TournamentManager/TournamentCreator.cs
+++ b/TournamentManager/TournamentManager/TournamentCreator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using SD.LLBLGen.Pro.ORMSupportClasses;
+using SD.LLBLGen.Pro.ORMSupportClasses;
 using TournamentManager.DAL.EntityClasses;
 using TournamentManager.DAL.HelperClasses;
 using TournamentManager.MultiTenancy;
diff --git a/TournamentManager/TournamentManager/TournamentManager.csproj b/TournamentManager/TournamentManager/TournamentManager.csproj
index 0584993a..2f7f4fed 100644
--- a/TournamentManager/TournamentManager/TournamentManager.csproj
+++ b/TournamentManager/TournamentManager/TournamentManager.csproj
@@ -13,6 +13,9 @@
         <Description>TournamentManager is the backend for Volleyball League.
 Volleyball League is an open source sports platform that brings everything necessary to organize and to run a league.
         </Description>
+        <!-- With dotnet, add parameter: -p:SatelliteResourceLanguages="""en;de""" -->
+        <SatelliteResourceLanguages>en;de</SatelliteResourceLanguages>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>