diff --git a/TransactionProcessorACL/Bootstrapper/MediatorRegistry.cs b/TransactionProcessorACL/Bootstrapper/MediatorRegistry.cs
index 847f9c3..df7a40d 100644
--- a/TransactionProcessorACL/Bootstrapper/MediatorRegistry.cs
+++ b/TransactionProcessorACL/Bootstrapper/MediatorRegistry.cs
@@ -1,17 +1,13 @@
 using Microsoft.Extensions.Configuration;
-using SimpleResults;
-using System.Collections.Generic;
 
 namespace TransactionProcessorACL.Bootstrapper
 {
     using BusinessLogic.RequestHandlers;
-    using BusinessLogic.Requests;
     using Lamar;
     using MediatR;
     using Microsoft.Extensions.DependencyInjection;
-    using Models;
     using System.Diagnostics.CodeAnalysis;
-    using TransactionProcessorACL.Common;
+    using Common;
     
     /// <summary>
     /// 
@@ -20,26 +16,15 @@ namespace TransactionProcessorACL.Bootstrapper
     [ExcludeFromCodeCoverage]
     public class MediatorRegistry : ServiceRegistry
     {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MediatorRegistry"/> class.
-        /// </summary>
-        public MediatorRegistry(IConfiguration configuration)
-        {
+        public MediatorRegistry(IConfiguration configuration) {
             string eventStoreConnectionString = configuration.GetValue<string>("EventStoreSettings:ConnectionString");
             int requestAuditStreamLifetimeDays = configuration.GetValue<int?>("AuditSettings:RequestAuditStreamLifetimeDays") ?? 7;
             this.AddKurrentDBClient(eventStoreConnectionString);
 
-            this.AddSingleton(new RequestAuditStreamOptions
-            {
-                RequestAuditStreamLifetimeDays = requestAuditStreamLifetimeDays
-            });
-            //this.AddSingleton<IRequestAuditRecorder, LoggingRequestAuditRecorder.KurrentDbRequestAuditRecorder>();
-            //this.AddTransient(typeof(IPipelineBehavior<,>), typeof(AuditPipelineBehavior<,>));
+            this.AddSingleton(new RequestAuditStreamOptions { RequestAuditStreamLifetimeDays = requestAuditStreamLifetimeDays });
+            this.AddSingleton<IRequestAuditRecorder, LoggingRequestAuditRecorder.KurrentDbRequestAuditRecorder>();
+            this.AddTransient(typeof(IPipelineBehavior<,>), typeof(AuditPipelineBehavior<,>));
             this.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(VersionCheckRequestHandler).Assembly));
         }
-
-        #endregion
     }
 }