diff --git a/src/activities/Elsa.Activities.Timers.Quartz/Extensions/TimersOptionsExtensions.cs b/src/activities/Elsa.Activities.Timers.Quartz/Extensions/TimersOptionsExtensions.cs
index d066136b1..4838ea5f5 100644
--- a/src/activities/Elsa.Activities.Timers.Quartz/Extensions/TimersOptionsExtensions.cs
+++ b/src/activities/Elsa.Activities.Timers.Quartz/Extensions/TimersOptionsExtensions.cs
@@ -3,7 +3,6 @@ using Elsa.Activities.Timers.Options;
 using Elsa.Activities.Timers.Quartz.Jobs;
 using Elsa.Activities.Timers.Quartz.Services;
 using Elsa.Activities.Timers.Services;
-using Elsa.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Quartz;
 
diff --git a/src/activities/Elsa.Activities.Timers.Quartz/Jobs/RunQuartzWorkflowJob.cs b/src/activities/Elsa.Activities.Timers.Quartz/Jobs/RunQuartzWorkflowJob.cs
index 977718c31..b27b48221 100644
--- a/src/activities/Elsa.Activities.Timers.Quartz/Jobs/RunQuartzWorkflowJob.cs
+++ b/src/activities/Elsa.Activities.Timers.Quartz/Jobs/RunQuartzWorkflowJob.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Elsa.Activities.Timers.Quartz.Services;
 using Elsa.DistributedLock;
 using Elsa.Models;
 using Elsa.Persistence;
diff --git a/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs b/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs
index 74e528096..787505d38 100644
--- a/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs
+++ b/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Elsa.Models;
 using Elsa.Services;
 using Elsa.Services.Models;
-using Newtonsoft.Json;
 
 namespace Elsa
 {
diff --git a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
index 735e71fee..41b43b184 100644
--- a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
+++ b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elsa.Comparers;
 using Newtonsoft.Json.Linq;
 using NodaTime;
diff --git a/src/core/Elsa.Core/Consumers/RunWorkflowInstanceConsumer.cs b/src/core/Elsa.Core/Consumers/RunWorkflowInstanceConsumer.cs
index cdecdf509..a059b9f9c 100644
--- a/src/core/Elsa.Core/Consumers/RunWorkflowInstanceConsumer.cs
+++ b/src/core/Elsa.Core/Consumers/RunWorkflowInstanceConsumer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Elsa.DistributedLock;
-using Elsa.Exceptions;
 using Elsa.Messages;
 using Elsa.Models;
 using Elsa.Persistence;
diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs
index a874b40f4..ff3b32c8e 100644
--- a/src/core/Elsa.Core/ElsaOptions.cs
+++ b/src/core/Elsa.Core/ElsaOptions.cs
@@ -22,7 +22,6 @@ using Rebus.Routing.TypeBased;
 using Rebus.Transport.InMem;
 using Storage.Net;
 using Storage.Net.Blobs;
-using LogLevel = Rebus.Logging.LogLevel;
 
 namespace Elsa
 {
diff --git a/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs b/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs
index 1e5e42954..45985ee68 100644
--- a/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs
+++ b/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Reflection;
-
-using MediatR;
 using MediatR.Registration;
 
 namespace Elsa.Indexing.Extensions
@@ -13,9 +11,9 @@ namespace Elsa.Indexing.Extensions
             var indexingOptions = new ElsaIndexingOptions(options.Services);
             configure.Invoke(indexingOptions);
 
-            ServiceRegistrar.AddMediatRClasses(options.Services,new[] { Assembly.GetExecutingAssembly() });
+            ServiceRegistrar.AddMediatRClasses(options.Services, new[] { Assembly.GetExecutingAssembly() });
 
             return options;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowDefinitionSearch.cs b/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowDefinitionSearch.cs
index c9c00c7d5..38751a389 100644
--- a/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowDefinitionSearch.cs
+++ b/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowDefinitionSearch.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Elsa.Indexing.Models;
 
 namespace Elsa.Indexing.Services
@@ -14,6 +13,6 @@ namespace Elsa.Indexing.Services
             int from = 0,
             int take = 20,
             CancellationToken cancellationToken = default
-         );
+        );
     }
-}
+}
\ No newline at end of file
diff --git a/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowInstanceSearch.cs b/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowInstanceSearch.cs
index c71eb59b9..4707d9f0e 100644
--- a/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowInstanceSearch.cs
+++ b/src/indexing/Elsa.Indexing.Abstractions/Services/IWorkflowInstanceSearch.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Elsa.Indexing.Models;
 using Elsa.Models;
 
@@ -9,7 +8,6 @@ namespace Elsa.Indexing.Services
 {
     public interface IWorkflowInstanceSearch
     {
-
         Task<List<WorkflowInstanceIndexModel>> SearchAsync(string search,
             string? contextType = null,
             string? contextId = null,
@@ -20,17 +18,17 @@ namespace Elsa.Indexing.Services
             int from = 0,
             int take = 20,
             CancellationToken cancellationToken = default
-           );
+        );
 
         Task<List<WorkflowInstanceIndexModel>> SearchAsync<TContext>(string search,
-           string? contextId,
-           string? definitionId = null,
-           string? tenantId = null,
-           WorkflowStatus? workflowStatus = null,
-           string? correlationId = null,
-           int from = 0,
-           int take = 20,
-           CancellationToken cancellationToken = default
-           );
+            string? contextId,
+            string? definitionId = null,
+            string? tenantId = null,
+            WorkflowStatus? workflowStatus = null,
+            string? correlationId = null,
+            int from = 0,
+            int take = 20,
+            CancellationToken cancellationToken = default
+        );
     }
-}
+}
\ No newline at end of file
diff --git a/src/indexing/Elsa.Indexing.Elasticsearch/Models/ElasticWorkflowInstance.cs b/src/indexing/Elsa.Indexing.Elasticsearch/Models/ElasticWorkflowInstance.cs
index 61f1820a7..6ae5c4dc2 100644
--- a/src/indexing/Elsa.Indexing.Elasticsearch/Models/ElasticWorkflowInstance.cs
+++ b/src/indexing/Elsa.Indexing.Elasticsearch/Models/ElasticWorkflowInstance.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-
 using Elsa.Models;
 
 using Nest;
diff --git a/src/indexing/Elsa.Indexing.Elasticsearch/Services/WorkflowInstanceSearch.cs b/src/indexing/Elsa.Indexing.Elasticsearch/Services/WorkflowInstanceSearch.cs
index 8ab0eeac6..75889869e 100644
--- a/src/indexing/Elsa.Indexing.Elasticsearch/Services/WorkflowInstanceSearch.cs
+++ b/src/indexing/Elsa.Indexing.Elasticsearch/Services/WorkflowInstanceSearch.cs
@@ -1,11 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
 using AutoMapper;
-
-using Elsa.Attributes;
 using Elsa.Extensions;
 using Elsa.Indexing.Extensions;
 using Elsa.Indexing.Models;
diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkStore.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkStore.cs
index fa9639ba6..4b369425a 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkStore.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkStore.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
-using AutoMapper;
 using Elsa.Models;
 using Elsa.Persistence.Specifications;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowExecutionLogRecordStore.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowExecutionLogRecordStore.cs
index 1cc2e360c..9587d4538 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowExecutionLogRecordStore.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowExecutionLogRecordStore.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using AutoMapper;
 using Elsa.Models;
 using Elsa.Persistence.Specifications;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Migrations/ElsaContextModelSnapshot.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Migrations/ElsaContextModelSnapshot.cs
index 3f6a68865..e231acf29 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Migrations/ElsaContextModelSnapshot.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Migrations/ElsaContextModelSnapshot.cs
@@ -3,8 +3,6 @@ using System;
 using Elsa.Persistence.EntityFramework.Core;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Elsa.Persistence.EntityFramework.SqlServer.Migrations
 {
diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Migrations/ElsaContextModelSnapshot.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Migrations/ElsaContextModelSnapshot.cs
index c312888a3..ca1222b16 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Migrations/ElsaContextModelSnapshot.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Migrations/ElsaContextModelSnapshot.cs
@@ -3,7 +3,6 @@ using System;
 using Elsa.Persistence.EntityFramework.Core;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Elsa.Persistence.EntityFramework.Sqlite.Migrations
 {
diff --git a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountdownActivity.cs b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountdownActivity.cs
index fcde86bea..5fa9f892e 100644
--- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountdownActivity.cs
+++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountdownActivity.cs
@@ -1,11 +1,8 @@
 using Elsa.Activities.Console;
 using Elsa.Activities.ControlFlow;
-using Elsa.Activities.Timers;
 using Elsa.Attributes;
 using Elsa.Builders;
 using Elsa.Services;
-using Elsa.Services.Models;
-using NodaTime;
 
 namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Activities
 {
diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
index 49ae605ad..c4323fc68 100644
--- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
@@ -1,14 +1,11 @@
-using System.Data;
 using Elsa.Activities.AzureServiceBus.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Sqlite;
-using Elsa.Persistence.YesSql.Extensions;
 using Elsa.Samples.AzureServiceBusWorker.Workflows;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using YesSql.Provider.Sqlite;
 
 namespace Elsa.Samples.AzureServiceBusWorker
 {
diff --git a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
index 2e26126c4..7f92342b1 100644
--- a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
@@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Rebus.Config;
 using Rebus.Routing.TypeBased;
-using LogLevel = Rebus.Logging.LogLevel;
 
 namespace Elsa.Rebus.AzureServiceBus
 {