diff --git a/src/Webserver.API/Exceptions/ApiBulkRequestException.cs b/src/Webserver.API/Exceptions/ApiBulkRequestException.cs
index bd808ad..1ea06d3 100644
--- a/src/Webserver.API/Exceptions/ApiBulkRequestException.cs
+++ b/src/Webserver.API/Exceptions/ApiBulkRequestException.cs
@@ -4,7 +4,6 @@
 using Newtonsoft.Json;
 using Siemens.Simatic.S7.Webserver.API.Models.Responses;
 using System;
-using System.Data;
 using System.Linq;
 using System.Text;
 
diff --git a/src/Webserver.API/Services/ApiStandardServiceFactory.cs b/src/Webserver.API/Services/ApiStandardServiceFactory.cs
index 8b6c3c9..82ebf8d 100644
--- a/src/Webserver.API/Services/ApiStandardServiceFactory.cs
+++ b/src/Webserver.API/Services/ApiStandardServiceFactory.cs
@@ -388,7 +388,7 @@ public async Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(HttpCl
         /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
         public IApiRequestHandler GetApiHttpClientRequestHandler(HttpClientConnectionConfiguration connectionConfiguration)
             => GetApiHttpClientRequestHandlerAsync(connectionConfiguration).GetAwaiter().GetResult();
-        
+
         /// <summary>
         /// Get an <see cref="ApiHttpClientRequestHandler"/> using the given <see cref="HttpClientConnectionConfiguration"/> 
         /// </summary>
diff --git a/src/Webserver.API/Services/RequestHandling/ApiHttpClientRequestHandler.cs b/src/Webserver.API/Services/RequestHandling/ApiHttpClientRequestHandler.cs
index f8f8544..84b3017 100644
--- a/src/Webserver.API/Services/RequestHandling/ApiHttpClientRequestHandler.cs
+++ b/src/Webserver.API/Services/RequestHandling/ApiHttpClientRequestHandler.cs
@@ -23,9 +23,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
-using System.Text.RegularExpressions;
-using Newtonsoft.Json.Linq;
-using Microsoft.AspNetCore.DataProtection;
 
 namespace Siemens.Simatic.S7.Webserver.API.Services.RequestHandling
 {
diff --git a/src/Webserver.API/Services/RequestHandling/ApiRequestFactory.cs b/src/Webserver.API/Services/RequestHandling/ApiRequestFactory.cs
index 0de0518..9ec469b 100644
--- a/src/Webserver.API/Services/RequestHandling/ApiRequestFactory.cs
+++ b/src/Webserver.API/Services/RequestHandling/ApiRequestFactory.cs
@@ -731,7 +731,7 @@ public virtual IEnumerable<IApiRequest> GetApiBulkRequestWithUniqueIds(IEnumerab
                 if (counter > 1)
                 {
                     _logger.LogTrace($"In '{nameof(GetApiBulkRequestWithUniqueIds)}' -> counter '{counter}' -> regenerate using '{nameof(RequestIdGenerator)}' -> type:'{RequestIdGenerator.GetType()}'");
-                    if (counter %10 == 0)
+                    if (counter % 10 == 0)
                     {
                         _logger.LogWarning($"In '{nameof(GetApiBulkRequestWithUniqueIds)}' -> counter '{counter}' -> regenerate using '{nameof(RequestIdGenerator)}' -> type:'{RequestIdGenerator.GetType()}' " +
                             $"time passed: '{DateTime.Now - startTime}', timeout: '{timeOut}', ignoreTimeout: '{ignoreTimeOut}'");
diff --git a/src/Webserver.API/Services/RequestHandling/IApiRequestHandler.cs b/src/Webserver.API/Services/RequestHandling/IApiRequestHandler.cs
index 7609747..32c1387 100644
--- a/src/Webserver.API/Services/RequestHandling/IApiRequestHandler.cs
+++ b/src/Webserver.API/Services/RequestHandling/IApiRequestHandler.cs
@@ -152,7 +152,7 @@ public interface IApiRequestHandler
         /// </summary>
         /// <returns>A QuantityStructure object</returns>
         ApiGetQuantityStructuresResponse ApiGetQuantityStructures();
-        
+
         /// <summary>
         /// Send a Api.Login Request 
         /// </summary>