diff --git a/Startup.cs b/Startup.cs
index 5fcdc43..429b04a 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -6,7 +6,6 @@ using IdentityModel.AspNetCore.OAuth2Introspection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -15,20 +14,10 @@ using Newtonsoft.Json.Serialization;
 using xApi.Extensions;
 using xCommons.Configurations;
 using xCommons.Extensions;
-// using xDataHelper;
-// using xDataHelper.DbSeeder;
-// using xDataHelper.Helpers;
-using xDataService.Configuration;
-using xDataService.Constants;
 using xDataService.DI;
-using xDataService.Interfaces;
 using xHttpService.DI;
 using xIdentityService.DI;
-// using xPushHelper.DI;
-using xPushService.DI;
-using xPushService.Helpers;
 using xServices.Databases;
-using xServices.DI;
 
 namespace xApi
 {
@@ -176,7 +165,8 @@ namespace xApi
 
             //
             // Use xDataService Middleware ...
-            app.UseXDatabase(apiDatabaseDescriptor);
+            // TODO: Fix this ...
+            // app.UseXDatabase(apiDatabaseDescriptor);
 
             //
             // Using Services ...