diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 8ef43b8..2ca8da8 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -87,8 +87,8 @@ namespace xCategoryService.DI
 
             //
             // SubCategory ...
-            pushHelper.AddHub<XSubCategoryDtoHub>("subCategoryDto");
-            pushHelper.AddHub<XSubCategoryEntityHub>("subCategoryEntity");
+            // pushHelper.AddHub<XSubCategoryDtoHub>("subCategoryDto");
+            // pushHelper.AddHub<XSubCategoryEntityHub>("subCategoryEntity");
 
             //
             app.UseXPushService(pushHelper);
@@ -109,11 +109,11 @@ namespace xCategoryService.DI
             // Using XSubCategory Repository Descriptor ...
             if (!subCategoryDescriptor.IsNull())
             {
-                //
-                app.UseXRepository(
-                    descriptor: subCategoryDescriptor,
-                    isDevelopmentEnvironment: isDevelopmentEnvironment
-                );
+                // //
+                // app.UseXRepository(
+                //     descriptor: subCategoryDescriptor,
+                //     isDevelopmentEnvironment: isDevelopmentEnvironment
+                // );
             }
         }
 
@@ -239,20 +239,28 @@ namespace xCategoryService.DI
 
             //
             // Register Category Repository Descriptor ...
-            services.AddXRepository(
-                lifeTime: lifeTime,
-                descriptor: categoryDescriptor
-            );
+            if (!categoryDescriptor.IsNull())
+            {
+                //
+                services.AddXRepository(
+                    lifeTime: lifeTime,
+                    descriptor: categoryDescriptor
+                );
+            }
 
             //
             // Register SubCategory Repository Descriptor ...
-            services.AddXRepository(
-                lifeTime: lifeTime,
-                descriptor: subCategoryDescriptor
-            );
+            if (!subCategoryDescriptor.IsNull())
+            {
+                //
+                services.AddXRepository(
+                    lifeTime: lifeTime,
+                    descriptor: subCategoryDescriptor
+                );
+            }
 
             //
-            #region  Register Services ...            
+            #region Register Services ...            
             //
             #region Category ...
             //
@@ -279,26 +287,26 @@ namespace xCategoryService.DI
 
             //
             #region SubCategory ...
-            //
-            // Models ...
-            services.Add(
-                new ServiceDescriptor(typeof(IXSubCategoryServiceProvider), typeof(XSubCategoryServiceProvider), lifeTime)
-            );
-            services.Add(
-                new ServiceDescriptor(typeof(IXSubCategoryRepositoryService), typeof(XSubCategoryRepositoryService), lifeTime)
-            );
-            services.Add(
-                new ServiceDescriptor(typeof(IXSubCategoryRepositoryProvider), typeof(XSubCategoryRepositoryProvider), lifeTime)
-            );
+            // //
+            // // Models ...
+            // services.Add(
+            //     new ServiceDescriptor(typeof(IXSubCategoryServiceProvider), typeof(XSubCategoryServiceProvider), lifeTime)
+            // );
+            // services.Add(
+            //     new ServiceDescriptor(typeof(IXSubCategoryRepositoryService), typeof(XSubCategoryRepositoryService), lifeTime)
+            // );
+            // services.Add(
+            //     new ServiceDescriptor(typeof(IXSubCategoryRepositoryProvider), typeof(XSubCategoryRepositoryProvider), lifeTime)
+            // );
 
-            //
-            // Resource Providers ...
-            services.Add(
-                new ServiceDescriptor(typeof(IXSubCategoryTitleResourceProvider), typeof(XSubCategoryTitleResourceProvider), lifeTime)
-            );
-            services.Add(
-                new ServiceDescriptor(typeof(IXSubCategoryDescriptionResourceProvider), typeof(XSubCategoryDescriptionResourceProvider), lifeTime)
-            );
+            // //
+            // // Resource Providers ...
+            // services.Add(
+            //     new ServiceDescriptor(typeof(IXSubCategoryTitleResourceProvider), typeof(XSubCategoryTitleResourceProvider), lifeTime)
+            // );
+            // services.Add(
+            //     new ServiceDescriptor(typeof(IXSubCategoryDescriptionResourceProvider), typeof(XSubCategoryDescriptionResourceProvider), lifeTime)
+            // );
             #endregion
             #endregion
 
diff --git a/Providers/Entities/XCategoryRepositoryProvider.cs b/Providers/Entities/XCategoryRepositoryProvider.cs
index aa6053a..154a789 100644
--- a/Providers/Entities/XCategoryRepositoryProvider.cs
+++ b/Providers/Entities/XCategoryRepositoryProvider.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR;
 using xCategoryService.Interfaces.Entities;
 using xCategoryService.Models.Entities;
diff --git a/Providers/GraphQL/XSubCategoryGraphQuery.cs b/Providers/GraphQL/XSubCategoryGraphQuery.cs
index 9950c11..7ccc651 100644
--- a/Providers/GraphQL/XSubCategoryGraphQuery.cs
+++ b/Providers/GraphQL/XSubCategoryGraphQuery.cs
@@ -3,7 +3,6 @@ using xCategoryService.Interfaces.Entities;
 using xCategoryService.Models.Entities;
 using xDataService.Configuration;
 using xDataService.GraphQL;
-using xDataService.Interfaces;
 
 namespace xCategoryService.Providers.GraphQL
 {
diff --git a/Providers/GraphQL/XSubCategoryGraphSchema.cs b/Providers/GraphQL/XSubCategoryGraphSchema.cs
index 12f1e33..55a6fe7 100644
--- a/Providers/GraphQL/XSubCategoryGraphSchema.cs
+++ b/Providers/GraphQL/XSubCategoryGraphSchema.cs
@@ -9,6 +9,5 @@ namespace xCategoryService.Providers.GraphQL
         {
             Query = (XSubCategoryGraphQuery)services.GetService(typeof(XSubCategoryGraphQuery));
         }
-
     }
 }
\ No newline at end of file