diff --git a/src/Web/WebhookClient/Controllers/WebhooksReceivedController.cs b/src/Web/WebhookClient/Controllers/WebhooksReceivedController.cs
index 7746b6059..985031106 100644
--- a/src/Web/WebhookClient/Controllers/WebhooksReceivedController.cs
+++ b/src/Web/WebhookClient/Controllers/WebhooksReceivedController.cs
@@ -1,9 +1,6 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;
@@ -19,7 +16,7 @@ namespace WebhookClient.Controllers
         private readonly Settings _settings;
         private readonly ILogger _logger;
         private readonly IHooksRepository _hooksRepository;
-        
+
         public WebhooksReceivedController(IOptions<Settings> settings, ILogger<WebhooksReceivedController> logger, IHooksRepository hooksRepository)
         {
             _settings = settings.Value;
diff --git a/src/Web/WebhookClient/HeaderNames.cs b/src/Web/WebhookClient/HeaderNames.cs
index c84eed123..6a7f57577 100644
--- a/src/Web/WebhookClient/HeaderNames.cs
+++ b/src/Web/WebhookClient/HeaderNames.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient
+namespace WebhookClient
 {
     static class HeaderNames
     {
diff --git a/src/Web/WebhookClient/HttpClientAuthorizationDelegatingHandler.cs b/src/Web/WebhookClient/HttpClientAuthorizationDelegatingHandler.cs
index c4333707f..01cc29038 100644
--- a/src/Web/WebhookClient/HttpClientAuthorizationDelegatingHandler.cs
+++ b/src/Web/WebhookClient/HttpClientAuthorizationDelegatingHandler.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
diff --git a/src/Web/WebhookClient/Models/WebHookReceived.cs b/src/Web/WebhookClient/Models/WebHookReceived.cs
index 80cc46c4b..3da5bae48 100644
--- a/src/Web/WebhookClient/Models/WebHookReceived.cs
+++ b/src/Web/WebhookClient/Models/WebHookReceived.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {
     public class WebHookReceived
     {
         public DateTime When { get; set; }
+        
         public string Data { get; set; }
 
         public string Token { get; set; }
diff --git a/src/Web/WebhookClient/Models/WebhookData.cs b/src/Web/WebhookClient/Models/WebhookData.cs
index 7172d2aaa..c80a8d980 100644
--- a/src/Web/WebhookClient/Models/WebhookData.cs
+++ b/src/Web/WebhookClient/Models/WebhookData.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {
diff --git a/src/Web/WebhookClient/Models/WebhookResponse.cs b/src/Web/WebhookClient/Models/WebhookResponse.cs
index 464afe85b..5b1aadd45 100644
--- a/src/Web/WebhookClient/Models/WebhookResponse.cs
+++ b/src/Web/WebhookClient/Models/WebhookResponse.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {
diff --git a/src/Web/WebhookClient/Models/WebhookSubscriptionRequest.cs b/src/Web/WebhookClient/Models/WebhookSubscriptionRequest.cs
index 4e4ea2b57..c770c27ed 100644
--- a/src/Web/WebhookClient/Models/WebhookSubscriptionRequest.cs
+++ b/src/Web/WebhookClient/Models/WebhookSubscriptionRequest.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient.Models
+namespace WebhookClient.Models
 {
     public class WebhookSubscriptionRequest
     {
diff --git a/src/Web/WebhookClient/Pages/Error.cshtml.cs b/src/Web/WebhookClient/Pages/Error.cshtml.cs
index e85ff4111..607d14db1 100644
--- a/src/Web/WebhookClient/Pages/Error.cshtml.cs
+++ b/src/Web/WebhookClient/Pages/Error.cshtml.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Diagnostics;
 
 namespace WebhookClient.Pages
 {
diff --git a/src/Web/WebhookClient/Pages/Index.cshtml.cs b/src/Web/WebhookClient/Pages/Index.cshtml.cs
index 0e3169f08..417913a20 100644
--- a/src/Web/WebhookClient/Pages/Index.cshtml.cs
+++ b/src/Web/WebhookClient/Pages/Index.cshtml.cs
@@ -1,10 +1,6 @@
-using System;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Http;
 using WebhookClient.Models;
 using WebhookClient.Services;
 
diff --git a/src/Web/WebhookClient/Pages/Privacy.cshtml.cs b/src/Web/WebhookClient/Pages/Privacy.cshtml.cs
index 96aff0e9e..8976468a9 100644
--- a/src/Web/WebhookClient/Pages/Privacy.cshtml.cs
+++ b/src/Web/WebhookClient/Pages/Privacy.cshtml.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebhookClient.Pages
 {
diff --git a/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs b/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs
index 3e52cda27..8ff384b41 100644
--- a/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs
+++ b/src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Threading.Tasks;
 using WebhookClient.Models;
 
 namespace WebhookClient.Pages
diff --git a/src/Web/WebhookClient/Pages/WebhooksList.cshtml.cs b/src/Web/WebhookClient/Pages/WebhooksList.cshtml.cs
index 7a523c644..c1c8c8012 100644
--- a/src/Web/WebhookClient/Pages/WebhooksList.cshtml.cs
+++ b/src/Web/WebhookClient/Pages/WebhooksList.cshtml.cs
@@ -1,9 +1,6 @@
-using System;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using WebhookClient.Models;
 using WebhookClient.Services;
 
diff --git a/src/Web/WebhookClient/Program.cs b/src/Web/WebhookClient/Program.cs
index ff293ce5a..4d763f7fd 100644
--- a/src/Web/WebhookClient/Program.cs
+++ b/src/Web/WebhookClient/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace WebhookClient
 {
diff --git a/src/Web/WebhookClient/Services/IHooksRepository.cs b/src/Web/WebhookClient/Services/IHooksRepository.cs
index 35d6d73e7..73e89e819 100644
--- a/src/Web/WebhookClient/Services/IHooksRepository.cs
+++ b/src/Web/WebhookClient/Services/IHooksRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using WebhookClient.Models;
 
diff --git a/src/Web/WebhookClient/Services/IWebhooksClient.cs b/src/Web/WebhookClient/Services/IWebhooksClient.cs
index 5d14077cc..20238c0a3 100644
--- a/src/Web/WebhookClient/Services/IWebhooksClient.cs
+++ b/src/Web/WebhookClient/Services/IWebhooksClient.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using WebhookClient.Models;
 
diff --git a/src/Web/WebhookClient/Services/InMemoryHooksRepository.cs b/src/Web/WebhookClient/Services/InMemoryHooksRepository.cs
index 557aa707b..35bcd2bad 100644
--- a/src/Web/WebhookClient/Services/InMemoryHooksRepository.cs
+++ b/src/Web/WebhookClient/Services/InMemoryHooksRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;
diff --git a/src/Web/WebhookClient/Services/WebhooksClient.cs b/src/Web/WebhookClient/Services/WebhooksClient.cs
index 379c003ad..3293f282d 100644
--- a/src/Web/WebhookClient/Services/WebhooksClient.cs
+++ b/src/Web/WebhookClient/Services/WebhooksClient.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
diff --git a/src/Web/WebhookClient/Settings.cs b/src/Web/WebhookClient/Settings.cs
index 213d272e4..3077d91b0 100644
--- a/src/Web/WebhookClient/Settings.cs
+++ b/src/Web/WebhookClient/Settings.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient
+namespace WebhookClient
 {
     public class Settings
     {