diff --git a/src/activities/Elsa.Activities.Http/Controllers/HttpWorkflowsController.cs b/src/activities/Elsa.Activities.Http/Controllers/HttpWorkflowsController.cs
index 1d777daa8..04436596a 100644
--- a/src/activities/Elsa.Activities.Http/Controllers/HttpWorkflowsController.cs
+++ b/src/activities/Elsa.Activities.Http/Controllers/HttpWorkflowsController.cs
@@ -2,7 +2,6 @@ using System.Threading;
using System.Threading.Tasks;
using Elsa.Activities.Http.Models;
using Elsa.Activities.Http.Services;
-using Elsa.Extensions;
using Elsa.Persistence;
using Elsa.Services;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
index 2c8e11488..0be5177cb 100644
--- a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
+++ b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
using System;
+using Elsa;
using Elsa.Activities.Http;
using Elsa.Activities.Http.Handlers;
using Elsa.Activities.Http.Options;
@@ -6,7 +7,6 @@ using Elsa.Activities.Http.Parsers;
using Elsa.Activities.Http.RequestHandlers.Handlers;
using Elsa.Activities.Http.Services;
using Elsa.Activities.Http.Triggers;
-using Elsa.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs
index 51916e591..a67020358 100644
--- a/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs
+++ b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs
@@ -3,7 +3,6 @@ using System.Net;
using System.Threading.Tasks;
using Elsa.Activities.Http.Extensions;
using Elsa.Activities.Http.Triggers;
-using Elsa.Extensions;
using Elsa.Persistence;
using Elsa.Services;
using Elsa.Triggers;
diff --git a/src/activities/Elsa.Activities.Http/RequestHandlers/Handlers/SignalRequestHandler.cs b/src/activities/Elsa.Activities.Http/RequestHandlers/Handlers/SignalRequestHandler.cs
index aed357b13..9796c6365 100644
--- a/src/activities/Elsa.Activities.Http/RequestHandlers/Handlers/SignalRequestHandler.cs
+++ b/src/activities/Elsa.Activities.Http/RequestHandlers/Handlers/SignalRequestHandler.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
using Elsa.Activities.Http.Models;
using Elsa.Activities.Http.RequestHandlers.Results;
using Elsa.Activities.Http.Services;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Services;
diff --git a/src/activities/Elsa.Activities.Timers/Jobs/RunWorkflowJob.cs b/src/activities/Elsa.Activities.Timers/Jobs/RunWorkflowJob.cs
index 3ff4b583b..5a78f6cb3 100644
--- a/src/activities/Elsa.Activities.Timers/Jobs/RunWorkflowJob.cs
+++ b/src/activities/Elsa.Activities.Timers/Jobs/RunWorkflowJob.cs
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications;
diff --git a/src/core/Elsa.Core/Activities/Signaling/Activities/InterruptTrigger/InterruptTrigger.cs b/src/core/Elsa.Core/Activities/Signaling/Activities/InterruptTrigger/InterruptTrigger.cs
index 5425f20b0..857c1e2e1 100644
--- a/src/core/Elsa.Core/Activities/Signaling/Activities/InterruptTrigger/InterruptTrigger.cs
+++ b/src/core/Elsa.Core/Activities/Signaling/Activities/InterruptTrigger/InterruptTrigger.cs
@@ -1,7 +1,6 @@
using System.Threading.Tasks;
using Elsa.ActivityResults;
using Elsa.Attributes;
-using Elsa.Extensions;
using Elsa.Persistence;
using Elsa.Services;
using Elsa.Services.Models;
diff --git a/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Extensions/RunWorkflowExtensions.cs b/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Extensions/RunWorkflowExtensions.cs
index 5b5b3feb3..b8b01eed9 100644
--- a/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Extensions/RunWorkflowExtensions.cs
+++ b/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Extensions/RunWorkflowExtensions.cs
@@ -1,7 +1,6 @@
using System;
using System.Threading.Tasks;
using Elsa.Builders;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Services;
using Elsa.Services.Models;
diff --git a/src/core/Elsa.Core/Builders/ActivityFluentSetup.cs b/src/core/Elsa.Core/Builders/ActivityFluentSetup.cs
index 9c514c70d..e777951da 100644
--- a/src/core/Elsa.Core/Builders/ActivityFluentSetup.cs
+++ b/src/core/Elsa.Core/Builders/ActivityFluentSetup.cs
@@ -1,6 +1,5 @@
using System;
using System.Linq.Expressions;
-using Elsa.Extensions;
using Elsa.Services;
using Elsa.Services.Models;
diff --git a/src/core/Elsa.Core/Builders/SetupActivity.cs b/src/core/Elsa.Core/Builders/SetupActivity.cs
index c2799f54d..19e513ed5 100644
--- a/src/core/Elsa.Core/Builders/SetupActivity.cs
+++ b/src/core/Elsa.Core/Builders/SetupActivity.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Services;
using Elsa.Services.Models;
diff --git a/src/core/Elsa.Core/Consumers/RunWorkflowConsumer.cs b/src/core/Elsa.Core/Consumers/RunWorkflowConsumer.cs
index 84d15c06c..1a48f35f4 100644
--- a/src/core/Elsa.Core/Consumers/RunWorkflowConsumer.cs
+++ b/src/core/Elsa.Core/Consumers/RunWorkflowConsumer.cs
@@ -1,6 +1,5 @@
using System.Threading.Tasks;
using Elsa.Exceptions;
-using Elsa.Extensions;
using Elsa.Messages;
using Elsa.Persistence;
using Elsa.Services;
diff --git a/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings b/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
index 9d2dd8dfd..1e306d317 100644
--- a/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
+++ b/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
@@ -2,4 +2,5 @@
True
True
True
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs
index f18bc944e..c5b2c7aef 100644
--- a/src/core/Elsa.Core/ElsaOptions.cs
+++ b/src/core/Elsa.Core/ElsaOptions.cs
@@ -1,7 +1,6 @@
using System;
using Elsa.Caching;
using Elsa.DistributedLock;
-using Elsa.Extensions;
using Elsa.Persistence;
using Elsa.Persistence.InMemory;
using Elsa.Serialization;
diff --git a/src/core/Elsa.Core/Extensions/AutoMapperServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/AutoMapperServiceCollectionExtensions.cs
index d55946ac0..185bc37d0 100644
--- a/src/core/Elsa.Core/Extensions/AutoMapperServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/AutoMapperServiceCollectionExtensions.cs
@@ -6,7 +6,7 @@ using AutoMapper;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class AutoMapperServiceCollectionExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/CacheEntryExtensions.cs b/src/core/Elsa.Core/Extensions/CacheEntryExtensions.cs
index e1c500d70..d8a658014 100644
--- a/src/core/Elsa.Core/Extensions/CacheEntryExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/CacheEntryExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Primitives;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class CacheEntryExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
index 066fbfa7a..43908dfa4 100644
--- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -11,7 +11,6 @@ using Elsa.Builders;
using Elsa.Consumers;
using Elsa.Converters;
using Elsa.Expressions;
-using Elsa.Extensions;
using Elsa.HostedServices;
using Elsa.Mapping;
using Elsa.Metadata;
diff --git a/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs b/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs
index d4d8edd06..95300050a 100644
--- a/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs
@@ -2,7 +2,7 @@
using System.Runtime.InteropServices;
using System.Security;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class ExceptionExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/LambdaExtensions.cs b/src/core/Elsa.Core/Extensions/LambdaExtensions.cs
index 99e99ce47..c41751703 100644
--- a/src/core/Elsa.Core/Extensions/LambdaExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/LambdaExtensions.cs
@@ -2,7 +2,7 @@ using System;
using System.Linq.Expressions;
using System.Reflection;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class LambdaExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs
index 2f77ef12c..a41af2dca 100644
--- a/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs
@@ -5,7 +5,7 @@ using MediatR;
using MediatR.Registration;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class MessageHandlerServiceCollectionExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/StringExtensions.cs b/src/core/Elsa.Core/Extensions/StringExtensions.cs
index 90d989c4a..2d78adb96 100644
--- a/src/core/Elsa.Core/Extensions/StringExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/StringExtensions.cs
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class StringExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/TypeBaseRouterConfigurationBuilderExtensions.cs b/src/core/Elsa.Core/Extensions/TypeBaseRouterConfigurationBuilderExtensions.cs
index 7b786bda4..a5aea7af9 100644
--- a/src/core/Elsa.Core/Extensions/TypeBaseRouterConfigurationBuilderExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/TypeBaseRouterConfigurationBuilderExtensions.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Rebus.Routing.TypeBased;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class TypeBaseRouterConfigurationBuilderExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/WorkflowDefinitionStoreExtensions.cs b/src/core/Elsa.Core/Extensions/WorkflowDefinitionStoreExtensions.cs
index 50788f243..7a408273c 100644
--- a/src/core/Elsa.Core/Extensions/WorkflowDefinitionStoreExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/WorkflowDefinitionStoreExtensions.cs
@@ -4,7 +4,7 @@ using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class WorkflowDefinitionStoreExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/WorkflowInstanceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/WorkflowInstanceCollectionExtensions.cs
index 5ee7ac404..17e6bae36 100644
--- a/src/core/Elsa.Core/Extensions/WorkflowInstanceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/WorkflowInstanceCollectionExtensions.cs
@@ -2,7 +2,7 @@
using System.Linq;
using Elsa.Models;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class WorkflowInstanceCollectionExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/WorkflowInstanceStoreExtensions.cs b/src/core/Elsa.Core/Extensions/WorkflowInstanceStoreExtensions.cs
index 8aba7a5e2..9a73db379 100644
--- a/src/core/Elsa.Core/Extensions/WorkflowInstanceStoreExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/WorkflowInstanceStoreExtensions.cs
@@ -5,7 +5,7 @@ using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class WorkflowInstanceStoreExtensions
{
diff --git a/src/core/Elsa.Core/Extensions/WorkflowRegistryExtensions.cs b/src/core/Elsa.Core/Extensions/WorkflowRegistryExtensions.cs
index 9ba3ea911..0a8868f83 100644
--- a/src/core/Elsa.Core/Extensions/WorkflowRegistryExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/WorkflowRegistryExtensions.cs
@@ -4,7 +4,7 @@ using Elsa.Models;
using Elsa.Services;
using Elsa.Services.Models;
-namespace Elsa.Extensions
+namespace Elsa
{
public static class WorkflowRegistryExtensions
{
diff --git a/src/core/Elsa.Core/Services/WorkflowPublisher.cs b/src/core/Elsa.Core/Services/WorkflowPublisher.cs
index 849b5e886..6a5fe4342 100644
--- a/src/core/Elsa.Core/Services/WorkflowPublisher.cs
+++ b/src/core/Elsa.Core/Services/WorkflowPublisher.cs
@@ -1,6 +1,5 @@
using System.Threading;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
diff --git a/src/core/Elsa.Core/Services/WorkflowRunner.cs b/src/core/Elsa.Core/Services/WorkflowRunner.cs
index ea5105154..94710637b 100644
--- a/src/core/Elsa.Core/Services/WorkflowRunner.cs
+++ b/src/core/Elsa.Core/Services/WorkflowRunner.cs
@@ -7,7 +7,6 @@ using Elsa.ActivityResults;
using Elsa.Builders;
using Elsa.Events;
using Elsa.Exceptions;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Services.Models;
diff --git a/src/dashboards/blazor/ElsaDashboard.Application.Server/ElsaDashboard.Application.Server.csproj b/src/dashboards/blazor/ElsaDashboard.Application.Server/ElsaDashboard.Application.Server.csproj
index 0f24a4596..12358e9d4 100644
--- a/src/dashboards/blazor/ElsaDashboard.Application.Server/ElsaDashboard.Application.Server.csproj
+++ b/src/dashboards/blazor/ElsaDashboard.Application.Server/ElsaDashboard.Application.Server.csproj
@@ -20,8 +20,4 @@
-
-
-
-
diff --git a/src/persistence/Elsa.Persistence.YesSql/Extensions/ServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.YesSql/Extensions/ServiceCollectionExtensions.cs
index 578c69ec2..99f783b46 100644
--- a/src/persistence/Elsa.Persistence.YesSql/Extensions/ServiceCollectionExtensions.cs
+++ b/src/persistence/Elsa.Persistence.YesSql/Extensions/ServiceCollectionExtensions.cs
@@ -2,7 +2,6 @@ using System;
using System.Data;
using System.Linq;
using Elsa.Data;
-using Elsa.Extensions;
using Elsa.Persistence.YesSql.Data;
using Elsa.Persistence.YesSql.Documents;
using Elsa.Persistence.YesSql.Indexes;
diff --git a/src/persistence/Elsa.Persistence.YesSql/Services/DataMigrationManager.cs b/src/persistence/Elsa.Persistence.YesSql/Services/DataMigrationManager.cs
index 7f75c063c..a4de77b8d 100644
--- a/src/persistence/Elsa.Persistence.YesSql/Services/DataMigrationManager.cs
+++ b/src/persistence/Elsa.Persistence.YesSql/Services/DataMigrationManager.cs
@@ -5,7 +5,6 @@ using System.Reflection;
using System.Threading.Tasks;
using Elsa.Data;
-using Elsa.Extensions;
using Elsa.Persistence.YesSql.Data;
using Elsa.Persistence.YesSql.Documents;
using Microsoft.Extensions.Logging;
diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
index cbb02619a..1e0bee903 100644
--- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
+++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
@@ -1,6 +1,5 @@
using System.IO;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Services;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
index 2face3c6b..7a216c1b0 100644
--- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
@@ -1,6 +1,5 @@
using System;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications;
diff --git a/src/scripting/Elsa.Scripting.JavaScript/Extensions/JavaScriptServiceCollectionExtensions.cs b/src/scripting/Elsa.Scripting.JavaScript/Extensions/JavaScriptServiceCollectionExtensions.cs
index e3b24dd6f..6f37f5f7d 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/Extensions/JavaScriptServiceCollectionExtensions.cs
+++ b/src/scripting/Elsa.Scripting.JavaScript/Extensions/JavaScriptServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
-using Elsa.Extensions;
using Elsa.Scripting.JavaScript.Options;
using Elsa.Scripting.JavaScript.Services;
using System;
+using Elsa;
using Elsa.Expressions;
// ReSharper disable once CheckNamespace
diff --git a/src/scripting/Elsa.Scripting.Liquid/Extensions/LiquidServiceCollectionExtensions.cs b/src/scripting/Elsa.Scripting.Liquid/Extensions/LiquidServiceCollectionExtensions.cs
index c3a4659f4..e887611ae 100644
--- a/src/scripting/Elsa.Scripting.Liquid/Extensions/LiquidServiceCollectionExtensions.cs
+++ b/src/scripting/Elsa.Scripting.Liquid/Extensions/LiquidServiceCollectionExtensions.cs
@@ -1,5 +1,4 @@
using Elsa.Expressions;
-using Elsa.Extensions;
using Elsa.Scripting.Liquid.Filters;
using Elsa.Scripting.Liquid.Options;
using Elsa.Scripting.Liquid.Services;
diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Delete.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Delete.cs
index 32f747057..e884c664b 100644
--- a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Delete.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Delete.cs
@@ -1,6 +1,5 @@
using System.Threading;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Persistence;
using Elsa.Services;
using Microsoft.AspNetCore.Http;
diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Get.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Get.cs
index 0e3810bd1..c729c3438 100644
--- a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Get.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/Get.cs
@@ -1,6 +1,5 @@
using System.Threading;
using System.Threading.Tasks;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Persistence;
using Microsoft.AspNetCore.Http;
diff --git a/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs b/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs
index 4ad7f637a..c31802e2b 100644
--- a/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs
+++ b/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,5 @@
using System;
-using Elsa.Extensions;
+using Elsa;
using Elsa.Models;
using Elsa.Server.Api.Extensions;
using Elsa.Server.Api.Mapping;
diff --git a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
index 51ceacedf..c39f9583f 100644
--- a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
@@ -1,5 +1,4 @@
-using Elsa.Extensions;
-using Elsa.Services;
+using Elsa.Services;
using Microsoft.Azure.ServiceBus.Primitives;
using Rebus.Config;
using Rebus.Logging;
diff --git a/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
index ab4eb7eea..510d3f37b 100644
--- a/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
@@ -1,5 +1,4 @@
-using Elsa.Extensions;
-using Elsa.Services;
+using Elsa.Services;
using Rebus.Config;
using Rebus.Logging;
using Rebus.Routing.TypeBased;
diff --git a/test/integration/Elsa.Core.IntegrationTests/StorageProvider/StorageWorkflowProviderTests.cs b/test/integration/Elsa.Core.IntegrationTests/StorageProvider/StorageWorkflowProviderTests.cs
index e48f7d61c..5c94f9df8 100644
--- a/test/integration/Elsa.Core.IntegrationTests/StorageProvider/StorageWorkflowProviderTests.cs
+++ b/test/integration/Elsa.Core.IntegrationTests/StorageProvider/StorageWorkflowProviderTests.cs
@@ -1,7 +1,6 @@
using System.Linq;
using System.Threading.Tasks;
using Elsa.Core.IntegrationTests.Helpers;
-using Elsa.Extensions;
using Elsa.Models;
using Elsa.Testing.Shared.Unit;
using Microsoft.Extensions.DependencyInjection;