diff --git a/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs b/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs
index c28e9f18a..dad7ed4b9 100644
--- a/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs
+++ b/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs
@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
 using Elsa.Activities.Rebus.Bookmarks;
-using Elsa.Dispatch;
 using Elsa.Services;
-using MediatR;
 using Rebus.Extensions;
 using Rebus.Handlers;
 using Rebus.Messages;
diff --git a/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs
index a76447912..fcab6558b 100644
--- a/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs
+++ b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs
@@ -2,8 +2,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Activities.Temporal.Common.Options;
-using Elsa.Attributes;
 using Elsa.Bookmarks;
 using NodaTime;
 
diff --git a/src/activities/Elsa.Activities.Temporal.Common/Handlers/SchedulePublishedWorkflows.cs b/src/activities/Elsa.Activities.Temporal.Common/Handlers/SchedulePublishedWorkflows.cs
index aefb35c0c..ae141446c 100644
--- a/src/activities/Elsa.Activities.Temporal.Common/Handlers/SchedulePublishedWorkflows.cs
+++ b/src/activities/Elsa.Activities.Temporal.Common/Handlers/SchedulePublishedWorkflows.cs
@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Activities.Temporal.Common.Bookmarks;
-using Elsa.Activities.Temporal.Common.Options;
 using Elsa.Activities.Temporal.Common.Services;
 using Elsa.Events;
 using Elsa.Triggers;
diff --git a/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowDefinitionScheduler.cs b/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowDefinitionScheduler.cs
index 4617dcae7..0527503ec 100644
--- a/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowDefinitionScheduler.cs
+++ b/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowDefinitionScheduler.cs
@@ -1,6 +1,5 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Activities.Temporal.Common.Options;
 using NodaTime;
 
 namespace Elsa.Activities.Temporal.Common.Services
diff --git a/src/activities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs b/src/activities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs
index b47121215..be5541056 100644
--- a/src/activities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs
+++ b/src/activities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Activities.Temporal.Common.Options;
 using Elsa.Activities.Temporal.Common.Services;
 using Elsa.Activities.Temporal.Hangfire.Extensions;
 using Elsa.Activities.Temporal.Hangfire.Jobs;
diff --git a/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowDefinitionScheduler.cs b/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowDefinitionScheduler.cs
index b0c602d45..8cb5f6eeb 100644
--- a/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowDefinitionScheduler.cs
+++ b/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowDefinitionScheduler.cs
@@ -1,6 +1,5 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Activities.Temporal.Common.Options;
 using Elsa.Activities.Temporal.Common.Services;
 using Elsa.Activities.Temporal.Quartz.Jobs;
 using Microsoft.Extensions.Logging;
diff --git a/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowInstanceScheduler.cs b/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowInstanceScheduler.cs
index 51241686a..3bee32045 100644
--- a/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowInstanceScheduler.cs
+++ b/src/activities/Elsa.Activities.Temporal.Quartz/Services/QuartzWorkflowInstanceScheduler.cs
@@ -1,6 +1,5 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Activities.Temporal.Common.Options;
 using Elsa.Activities.Temporal.Common.Services;
 using Elsa.Activities.Temporal.Quartz.Jobs;
 using Microsoft.Extensions.Logging;
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 fce934e1a..441160164 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
@@ -5,7 +5,6 @@ using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 using AutoMapper;
-using EFCore.BulkExtensions;
 using Elsa.Models;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Services;
diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
index 7b53e0757..44bc148e7 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
@@ -4,7 +4,6 @@ using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 using AutoMapper;
-using EFCore.BulkExtensions;
 using Elsa.Models;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Services;
diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
index c5542c757..1f934469b 100644
--- a/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
@@ -1,7 +1,5 @@
 using Elsa.Activities.Temporal;
-using Elsa.Activities.Temporal.Common.Services;
 using Elsa.Attributes;
-using Elsa.Persistence;
 using Microsoft.Extensions.Logging;
 using NodaTime;
 
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
index cc3c88db8..49172639f 100644
--- a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
+++ b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
@@ -1,11 +1,9 @@
-using System;
 using Elsa.Activities.UserTask.Extensions;
 using Elsa.Caching.Rebus.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.SqlServer;
 using Elsa.Rebus.RabbitMq;
 using Elsa.Samples.Server.Host.Activities;
-using Hangfire;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
diff --git a/src/server/Elsa.Server.Api/Endpoints/Signals/Dispatch.cs b/src/server/Elsa.Server.Api/Endpoints/Signals/Dispatch.cs
index 8dea7337f..fdd46fd36 100644
--- a/src/server/Elsa.Server.Api/Endpoints/Signals/Dispatch.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/Signals/Dispatch.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Activities.Signaling.Services;
 using Elsa.Server.Api.ActionFilters;
-using Elsa.Services.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Open.Linq.AsyncExtensions;
diff --git a/src/server/Elsa.Server.Api/Endpoints/Signals/Execute.cs b/src/server/Elsa.Server.Api/Endpoints/Signals/Execute.cs
index 372af9005..c815d5ea1 100644
--- a/src/server/Elsa.Server.Api/Endpoints/Signals/Execute.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/Signals/Execute.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/server/Elsa.Server.Api/Endpoints/Signals/Models.cs b/src/server/Elsa.Server.Api/Endpoints/Signals/Models.cs
index ef191901e..4c4c4ad45 100644
--- a/src/server/Elsa.Server.Api/Endpoints/Signals/Models.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/Signals/Models.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Elsa.Services.Models;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Elsa.Server.Api.Endpoints.Signals
 {
diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowDefinitions/Execute.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowDefinitions/Execute.cs
index 7ec7a6561..3a3416bd3 100644
--- a/src/server/Elsa.Server.Api/Endpoints/WorkflowDefinitions/Execute.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/WorkflowDefinitions/Execute.cs
@@ -1,13 +1,10 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Models;
 using Elsa.Server.Api.ActionFilters;
-using Elsa.Server.Api.Swagger.Examples;
 using Elsa.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
-using Swashbuckle.AspNetCore.Filters;
 
 namespace Elsa.Server.Api.Endpoints.WorkflowDefinitions
 {
diff --git a/src/server/Elsa.Server.Api/Endpoints/Workflows/Execute.cs b/src/server/Elsa.Server.Api/Endpoints/Workflows/Execute.cs
index ba0c021fb..15fb9c42a 100644
--- a/src/server/Elsa.Server.Api/Endpoints/Workflows/Execute.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/Workflows/Execute.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Server.Api.ActionFilters;
diff --git a/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs b/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs
index 40310076b..4fc3721a3 100644
--- a/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs
+++ b/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Elsa.Dispatch;
 using Elsa.Services;
-using MediatR;
 
 namespace Elsa.Server.Hangfire.Jobs
 {
diff --git a/src/server/Elsa.Server.Orleans/Grains/WorkflowDefinitionGrain.cs b/src/server/Elsa.Server.Orleans/Grains/WorkflowDefinitionGrain.cs
index 2b4aad413..840b819b3 100644
--- a/src/server/Elsa.Server.Orleans/Grains/WorkflowDefinitionGrain.cs
+++ b/src/server/Elsa.Server.Orleans/Grains/WorkflowDefinitionGrain.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Elsa.Dispatch;
 using Elsa.Server.Orleans.Grains.Contracts;
 using Elsa.Services;
-using MediatR;
 using Orleans;
 using Orleans.Concurrency;