diff --git a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQuery.cs b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQuery.cs
index e61daba..cb89632 100644
--- a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQuery.cs
+++ b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQuery.cs
@@ -1,5 +1,3 @@
-using MediatR;
-
 namespace BackOffice.BFF.Application.AuthorizationCQ.Queries.CheckUserPermission;
 
 public record CheckUserPermissionQuery(string Permission) : IRequest<bool>;
diff --git a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQueryHandler.cs b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQueryHandler.cs
index 27b5cd0..ef62f8d 100644
--- a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/CheckUserPermission/CheckUserPermissionQueryHandler.cs
@@ -1,8 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
-
 namespace BackOffice.BFF.Application.AuthorizationCQ.Queries.CheckUserPermission;
 
 public class CheckUserPermissionQueryHandler : IRequestHandler<CheckUserPermissionQuery, bool>
diff --git a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQuery.cs b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQuery.cs
index 54ea52b..ba8e868 100644
--- a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQuery.cs
+++ b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQuery.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using MediatR;
-
 namespace BackOffice.BFF.Application.AuthorizationCQ.Queries.GetUserRoles;
 
 public record GetUserRolesQuery : IRequest<IReadOnlyList<string>>;
diff --git a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQueryHandler.cs b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQueryHandler.cs
index ade9ef9..7fe0227 100644
--- a/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/AuthorizationCQ/Queries/GetUserRoles/GetUserRolesQueryHandler.cs
@@ -1,9 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
-
 namespace BackOffice.BFF.Application.AuthorizationCQ.Queries.GetUserRoles;
 
 public class GetUserRolesQueryHandler : IRequestHandler<GetUserRolesQuery, IReadOnlyList<string>>
diff --git a/src/BackOffice.BFF.Application/CategoryCQ/Commands/CreateNewCategory/CreateNewCategoryCommandHandler.cs b/src/BackOffice.BFF.Application/CategoryCQ/Commands/CreateNewCategory/CreateNewCategoryCommandHandler.cs
index c0e0134..9e96b8f 100644
--- a/src/BackOffice.BFF.Application/CategoryCQ/Commands/CreateNewCategory/CreateNewCategoryCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CategoryCQ/Commands/CreateNewCategory/CreateNewCategoryCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 
 namespace BackOffice.BFF.Application.CategoryCQ.Commands.CreateNewCategory;
diff --git a/src/BackOffice.BFF.Application/CategoryCQ/Commands/DeleteCategory/DeleteCategoryCommandHandler.cs b/src/BackOffice.BFF.Application/CategoryCQ/Commands/DeleteCategory/DeleteCategoryCommandHandler.cs
index bcddd8c..c0d844e 100644
--- a/src/BackOffice.BFF.Application/CategoryCQ/Commands/DeleteCategory/DeleteCategoryCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CategoryCQ/Commands/DeleteCategory/DeleteCategoryCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 
 namespace BackOffice.BFF.Application.CategoryCQ.Commands.DeleteCategory;
diff --git a/src/BackOffice.BFF.Application/CategoryCQ/Commands/UpdateCategory/UpdateCategoryCommandHandler.cs b/src/BackOffice.BFF.Application/CategoryCQ/Commands/UpdateCategory/UpdateCategoryCommandHandler.cs
index 5d1d08a..93a8d4e 100644
--- a/src/BackOffice.BFF.Application/CategoryCQ/Commands/UpdateCategory/UpdateCategoryCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/CategoryCQ/Commands/UpdateCategory/UpdateCategoryCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 
 namespace BackOffice.BFF.Application.CategoryCQ.Commands.UpdateCategory;
diff --git a/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetAllCategoryByFilter/GetAllCategoryByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetAllCategoryByFilter/GetAllCategoryByFilterQueryHandler.cs
index 6951505..1abbd22 100644
--- a/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetAllCategoryByFilter/GetAllCategoryByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetAllCategoryByFilter/GetAllCategoryByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 
 namespace BackOffice.BFF.Application.CategoryCQ.Queries.GetAllCategoryByFilter;
diff --git a/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetCategory/GetCategoryQueryHandler.cs b/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetCategory/GetCategoryQueryHandler.cs
index 33171dc..aba1228 100644
--- a/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetCategory/GetCategoryQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CategoryCQ/Queries/GetCategory/GetCategoryQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 
 namespace BackOffice.BFF.Application.CategoryCQ.Queries.GetCategory;
diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs
index e0079ba..8c089a4 100644
--- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ClubMembershipCQ/Commands/ActivateClub/ActivateClubCommandHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.ClubMembership.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Commands.ActivateClub;
 
diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs
index 8abb2c8..42581f9 100644
--- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetAllClubMembers/GetAllClubMembersQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.ClubMembership.Protobuf;
+
+using Foursat.BackOffice.BFF.ClubMembership.Protobuf;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetAllClubMembers;
 
diff --git a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs
index 9ac6a2f..fec0ce3 100644
--- a/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.ClubMembership.Protobuf;
+
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
 
 namespace BackOffice.BFF.Application.ClubMembershipCQ.Queries.GetClubStatistics;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
index 8f202f3..67097f6 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
@@ -1,5 +1,4 @@
 using BackOffice.BFF.Commission.Protobuf;
-using Google.Protobuf.WellKnownTypes;
 
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWithdrawalReports;
 
diff --git a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsResponseDto.cs b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsResponseDto.cs
index a570729..8b8e5a4 100644
--- a/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsResponseDto.cs
+++ b/src/BackOffice.BFF.Application/CommissionCQ/Queries/GetWorkerExecutionLogs/GetWorkerExecutionLogsResponseDto.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Models;
-
 namespace BackOffice.BFF.Application.CommissionCQ.Queries.GetWorkerExecutionLogs;
 
 public class GetWorkerExecutionLogsResponseDto
diff --git a/src/BackOffice.BFF.Application/Common/Behaviours/PerformanceBehaviour.cs b/src/BackOffice.BFF.Application/Common/Behaviours/PerformanceBehaviour.cs
index 84a3dcf..de7efd8 100644
--- a/src/BackOffice.BFF.Application/Common/Behaviours/PerformanceBehaviour.cs
+++ b/src/BackOffice.BFF.Application/Common/Behaviours/PerformanceBehaviour.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace BackOffice.BFF.Application.Common.Behaviours;
diff --git a/src/BackOffice.BFF.Application/Common/Interfaces/IAfrinoIdpService.cs b/src/BackOffice.BFF.Application/Common/Interfaces/IAfrinoIdpService.cs
index 882561a..8b592c8 100644
--- a/src/BackOffice.BFF.Application/Common/Interfaces/IAfrinoIdpService.cs
+++ b/src/BackOffice.BFF.Application/Common/Interfaces/IAfrinoIdpService.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BackOffice.BFF.Application.Common.Interfaces;
+namespace BackOffice.BFF.Application.Common.Interfaces;
 public interface IAfrinoIdpService
 {
     Task<bool> SendOtp(string mobile);
diff --git a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs b/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
index 35c3db0..e92a8be 100644
--- a/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
+++ b/src/BackOffice.BFF.Application/Common/Interfaces/IApplicationContractContext.cs
@@ -9,10 +9,7 @@ using CMSMicroservice.Protobuf.Protos.ProductImages;
 using CMSMicroservice.Protobuf.Protos.ProductGalleries;
 using CMSMicroservice.Protobuf.Protos.Category;
 using CMSMicroservice.Protobuf.Protos.ProductCategory;
-using BackOffice.BFF.Commission.Protobuf;
 using BackOffice.BFF.NetworkMembership.Protobuf;
-using BackOffice.BFF.ClubMembership.Protobuf;
-using BackOffice.BFF.Configuration.Protobuf;
 using FMSMicroservice.Protobuf.Protos.FileInfo;
 using CMSMicroservice.Protobuf.Protos.DiscountProduct;
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
@@ -21,6 +18,8 @@ using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 using CMSMicroservice.Protobuf.Protos.Tag;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 using CMSMicroservice.Protobuf.Protos;
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Configuration;
 
 namespace BackOffice.BFF.Application.Common.Interfaces;
 
diff --git a/src/BackOffice.BFF.Application/Common/Interfaces/IPermissionService.cs b/src/BackOffice.BFF.Application/Common/Interfaces/IPermissionService.cs
index b9e0058..fc17d6d 100644
--- a/src/BackOffice.BFF.Application/Common/Interfaces/IPermissionService.cs
+++ b/src/BackOffice.BFF.Application/Common/Interfaces/IPermissionService.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace BackOffice.BFF.Application.Common.Interfaces;
 
 public interface IPermissionService
diff --git a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
index 95d6915..9c28837 100644
--- a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
+++ b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
@@ -1,12 +1,8 @@
 using BackOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
-using BackOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder;
 using CMSMicroservice.Protobuf.Protos;
-using CMSMicroservice.Protobuf.Protos.UserOrder;
-using Google.Protobuf.WellKnownTypes;
 using CmsUserOrderFilter = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterFilter;
 using CmsUserOrderRequest = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterRequest;
 using GetAllUserOrderByFilterFilter = BackOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter.GetAllUserOrderByFilterFilter;
-using GetAllUserOrderByFilterResponseModel = BackOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter.GetAllUserOrderByFilterResponseModel;
 using CmsGetUserOrderResponse = CMSMicroservice.Protobuf.Protos.UserOrder.GetUserOrderResponse;
 using BffGetUserOrderResponseDto = BackOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder.GetUserOrderResponseDto;
 
diff --git a/src/BackOffice.BFF.Application/Common/Models/PermissionDefinitions.cs b/src/BackOffice.BFF.Application/Common/Models/PermissionDefinitions.cs
index 271d8b1..02d86e1 100644
--- a/src/BackOffice.BFF.Application/Common/Models/PermissionDefinitions.cs
+++ b/src/BackOffice.BFF.Application/Common/Models/PermissionDefinitions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace BackOffice.BFF.Application.Common.Models;
 
 public static class RoleNames
diff --git a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs
index c1a47cc..103645f 100644
--- a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs
@@ -1,6 +1,5 @@
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
 using Google.Protobuf;
-using Google.Protobuf.WellKnownTypes;
 
 namespace BackOffice.BFF.Application.DiscountCategoryCQ.Commands.CreateDiscountCategory;
 
diff --git a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/UpdateDiscountCategory/UpdateDiscountCategoryCommandHandler.cs b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/UpdateDiscountCategory/UpdateDiscountCategoryCommandHandler.cs
index d3c378b..67e2fd6 100644
--- a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/UpdateDiscountCategory/UpdateDiscountCategoryCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Commands/UpdateDiscountCategory/UpdateDiscountCategoryCommandHandler.cs
@@ -1,6 +1,5 @@
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
 using Google.Protobuf;
-using Google.Protobuf.WellKnownTypes;
 
 namespace BackOffice.BFF.Application.DiscountCategoryCQ.Commands.UpdateDiscountCategory;
 
diff --git a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Queries/GetDiscountCategories/GetDiscountCategoriesQueryHandler.cs b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Queries/GetDiscountCategories/GetDiscountCategoriesQueryHandler.cs
index e0230b8..e83eb44 100644
--- a/src/BackOffice.BFF.Application/DiscountCategoryCQ/Queries/GetDiscountCategories/GetDiscountCategoriesQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/DiscountCategoryCQ/Queries/GetDiscountCategories/GetDiscountCategoriesQueryHandler.cs
@@ -1,5 +1,4 @@
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
-using Google.Protobuf.WellKnownTypes;
 
 namespace BackOffice.BFF.Application.DiscountCategoryCQ.Queries.GetDiscountCategories;
 
diff --git a/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsQueryHandler.cs b/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsQueryHandler.cs
index 9d5393a..3c1f95c 100644
--- a/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsQueryHandler.cs
@@ -1,6 +1,4 @@
-using BackOffice.BFF.Application.Common.Models;
 using CMSMicroservice.Protobuf.Protos.DiscountProduct;
-using Google.Protobuf.WellKnownTypes;
 
 namespace BackOffice.BFF.Application.DiscountProductCQ.Queries.GetDiscountProducts;
 
diff --git a/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsResponseDto.cs b/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsResponseDto.cs
index 01d875d..3152613 100644
--- a/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsResponseDto.cs
+++ b/src/BackOffice.BFF.Application/DiscountProductCQ/Queries/GetDiscountProducts/GetDiscountProductsResponseDto.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Models;
-
 namespace BackOffice.BFF.Application.DiscountProductCQ.Queries.GetDiscountProducts;
 
 public class GetDiscountProductsResponseDto
diff --git a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQuery.cs b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQuery.cs
index 1046005..32b3366 100644
--- a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQuery.cs
+++ b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQuery.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Health.Protobuf;
+using Foursat.BackOffice.BFF.Health.Protobuf;
 
 namespace BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth;
 
diff --git a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
index 1e9e1ad..23ede9e 100644
--- a/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/HealthCQ/Queries/GetSystemHealth/GetSystemHealthQueryHandler.cs
@@ -1,5 +1,6 @@
-using BackOffice.BFF.Health.Protobuf;
-using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Configuration;
+using Foursat.BackOffice.BFF.Health.Protobuf;
 
 namespace BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth;
 
@@ -56,7 +57,7 @@ public class GetSystemHealthQueryHandler : IRequestHandler<GetSystemHealthQuery,
         {
             var stopwatch = System.Diagnostics.Stopwatch.StartNew();
             await _context.Configurations.GetAllConfigurationsAsync(
-                new BackOffice.BFF.Configuration.Protobuf.GetAllConfigurationsRequest 
+                new GetAllConfigurationsRequest 
                 { 
                     PageIndex = 1, 
                     PageSize = 1 
@@ -116,7 +117,7 @@ public class GetSystemHealthQueryHandler : IRequestHandler<GetSystemHealthQuery,
         {
             var stopwatch = System.Diagnostics.Stopwatch.StartNew();
             await _context.ClubMemberships.GetClubStatisticsAsync(
-                new BackOffice.BFF.ClubMembership.Protobuf.GetClubStatisticsRequest(), 
+                new GetClubStatisticsRequest(), 
                 cancellationToken: cancellationToken);
             stopwatch.Stop();
             clubHealthy = true;
diff --git a/src/BackOffice.BFF.Application/OtpCQ/Commands/SendOtp/SendOtpCommandHandler.cs b/src/BackOffice.BFF.Application/OtpCQ/Commands/SendOtp/SendOtpCommandHandler.cs
index b23b3ef..38c6967 100644
--- a/src/BackOffice.BFF.Application/OtpCQ/Commands/SendOtp/SendOtpCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/OtpCQ/Commands/SendOtp/SendOtpCommandHandler.cs
@@ -1,6 +1,4 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-
-namespace BackOffice.BFF.Application.OtpCQ.Commands.SendOtp;
+namespace BackOffice.BFF.Application.OtpCQ.Commands.SendOtp;
 public class SendOtpCommandHandler : IRequestHandler<SendOtpCommand, Unit>
 {
     private readonly IApplicationContractContext _context;
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Commands/CreateNewPackage/CreateNewPackageCommandHandler.cs b/src/BackOffice.BFF.Application/PackageCQ/Commands/CreateNewPackage/CreateNewPackageCommandHandler.cs
index dc1105d..df24326 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Commands/CreateNewPackage/CreateNewPackageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Commands/CreateNewPackage/CreateNewPackageCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Commands.CreateNewUser;
 using CMSMicroservice.Protobuf.Protos.Package;
 using Google.Protobuf;
 
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetAllPackageByFilter/GetAllPackageByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetAllPackageByFilter/GetAllPackageByFilterQueryHandler.cs
index 2dc525b..80fdde9 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetAllPackageByFilter/GetAllPackageByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetAllPackageByFilter/GetAllPackageByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetAllUserByFilter;
 using CMSMicroservice.Protobuf.Protos.Package;
 
 namespace BackOffice.BFF.Application.PackageCQ.Queries.GetAllPackageByFilter;
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetPackage/GetPackageQueryHandler.cs b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetPackage/GetPackageQueryHandler.cs
index 4464990..f7c5ca7 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetPackage/GetPackageQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetPackage/GetPackageQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetUser;
 using CMSMicroservice.Protobuf.Protos.Package;
 
 namespace BackOffice.BFF.Application.PackageCQ.Queries.GetPackage;
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQuery.cs b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQuery.cs
index 971715d..602c2f2 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQuery.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQuery.cs
@@ -1,5 +1,4 @@
 using BackOffice.BFF.Package.Protobuf.Protos.Package;
-using MediatR;
 
 namespace BackOffice.BFF.Application.PackageCQ.Queries.GetUserPackageStatus;
 
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryHandler.cs b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryHandler.cs
index 6830b95..3ff8e8e 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryHandler.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using BffPackage = BackOffice.BFF.Package.Protobuf.Protos.Package;
 using CmsPackage = CMSMicroservice.Protobuf.Protos.Package;
diff --git a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryValidator.cs b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryValidator.cs
index eb8c408..d510f2a 100644
--- a/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryValidator.cs
+++ b/src/BackOffice.BFF.Application/PackageCQ/Queries/GetUserPackageStatus/GetUserPackageStatusQueryValidator.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.PackageCQ.Queries.GetUserPackageStatus;
 
 public class GetUserPackageStatusQueryValidator : AbstractValidator<GetUserPackageStatusQuery>
diff --git a/src/BackOffice.BFF.Application/ProductTagCQ/Commands/AssignTagToProduct/AssignTagToProductCommand.cs b/src/BackOffice.BFF.Application/ProductTagCQ/Commands/AssignTagToProduct/AssignTagToProductCommand.cs
index a1622f7..06cb34d 100644
--- a/src/BackOffice.BFF.Application/ProductTagCQ/Commands/AssignTagToProduct/AssignTagToProductCommand.cs
+++ b/src/BackOffice.BFF.Application/ProductTagCQ/Commands/AssignTagToProduct/AssignTagToProductCommand.cs
@@ -1,5 +1,3 @@
-using CMSMicroservice.Protobuf.Protos.ProductTag;
-
 namespace BackOffice.BFF.Application.ProductTagCQ.Commands.AssignTagToProduct;
 
 public record AssignTagToProductCommand : IRequest<long>
diff --git a/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQuery.cs b/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQuery.cs
index 3773ffe..df8d0af 100644
--- a/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQuery.cs
+++ b/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQuery.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.ProductTagCQ.Queries.GetProductTagsByProduct;
-
 namespace BackOffice.BFF.Application.ProductTagCQ.Queries.GetProductTagsByProduct;
 
 public record GetProductTagsByProductQuery : IRequest<GetProductTagsByProductResponseDto>
diff --git a/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQueryHandler.cs b/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQueryHandler.cs
index 40a772d..7f6a8ee 100644
--- a/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductTagCQ/Queries/GetProductTagsByProduct/GetProductTagsByProductQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 
 namespace BackOffice.BFF.Application.ProductTagCQ.Queries.GetProductTagsByProduct;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/AddProductImage/AddProductImageCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/AddProductImage/AddProductImageCommandHandler.cs
index d679f29..324441c 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/AddProductImage/AddProductImageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/AddProductImage/AddProductImageCommandHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.ProductImages;
 using CMSMicroservice.Protobuf.Protos.ProductGalleries;
 using Google.Protobuf;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductPrices/BulkUpdateProductPricesCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductPrices/BulkUpdateProductPricesCommandHandler.cs
index b01a405..632f968 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductPrices/BulkUpdateProductPricesCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductPrices/BulkUpdateProductPricesCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.BulkUpdateProductPrices;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductStock/BulkUpdateProductStockCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductStock/BulkUpdateProductStockCommandHandler.cs
index 7ee5dd9..a60a6c1 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductStock/BulkUpdateProductStockCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/BulkUpdateProductStock/BulkUpdateProductStockCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.BulkUpdateProductStock;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/CreateNewProducts/CreateNewProductsCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/CreateNewProducts/CreateNewProductsCommandHandler.cs
index 9bbee0d..640e605 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/CreateNewProducts/CreateNewProductsCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/CreateNewProducts/CreateNewProductsCommandHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 using Google.Protobuf;
 using SixLabors.ImageSharp;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/DeleteProducts/DeleteProductsCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/DeleteProducts/DeleteProductsCommandHandler.cs
index 10f18d5..f69b59d 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/DeleteProducts/DeleteProductsCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/DeleteProducts/DeleteProductsCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.DeleteProducts;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/RemoveProductImage/RemoveProductImageCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/RemoveProductImage/RemoveProductImageCommandHandler.cs
index 620430f..34a35c2 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/RemoveProductImage/RemoveProductImageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/RemoveProductImage/RemoveProductImageCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.ProductGalleries;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.RemoveProductImage;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/ToggleProductStatus/ToggleProductStatusCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/ToggleProductStatus/ToggleProductStatusCommandHandler.cs
index 60c93ac..a60c535 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/ToggleProductStatus/ToggleProductStatusCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/ToggleProductStatus/ToggleProductStatusCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.ToggleProductStatus;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateCategoryProducts/UpdateCategoryProductsCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateCategoryProducts/UpdateCategoryProductsCommandHandler.cs
index 95bcebc..ba3a277 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateCategoryProducts/UpdateCategoryProductsCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateCategoryProducts/UpdateCategoryProductsCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSProductCategory = CMSMicroservice.Protobuf.Protos.ProductCategory;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.UpdateCategoryProducts;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProductCategories/UpdateProductCategoriesCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProductCategories/UpdateProductCategoriesCommandHandler.cs
index 071696e..d006169 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProductCategories/UpdateProductCategoriesCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProductCategories/UpdateProductCategoriesCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSProductCategory = CMSMicroservice.Protobuf.Protos.ProductCategory;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Commands.UpdateProductCategories;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProducts/UpdateProductsCommandHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProducts/UpdateProductsCommandHandler.cs
index 30da8d2..8d9b69e 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProducts/UpdateProductsCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Commands/UpdateProducts/UpdateProductsCommandHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 using Google.Protobuf;
 using SixLabors.ImageSharp;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetAllProductsByFilter/GetAllProductsByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetAllProductsByFilter/GetAllProductsByFilterQueryHandler.cs
index 553780d..e5c497e 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetAllProductsByFilter/GetAllProductsByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetAllProductsByFilter/GetAllProductsByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Queries.GetAllProductsByFilter;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetCategories/GetCategoriesQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetCategories/GetCategoriesQueryHandler.cs
index 04f5788..d57aa5d 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetCategories/GetCategoriesQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetCategories/GetCategoriesQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSCategory = CMSMicroservice.Protobuf.Protos.Category;
 using CMSProductCategory = CMSMicroservice.Protobuf.Protos.ProductCategory;
 
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQuery.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQuery.cs
index 8b4271f..52f305c 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQuery.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQuery.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Models;
-
 namespace BackOffice.BFF.Application.ProductsCQ.Queries.GetLowStockProducts;
 
 public record GetLowStockProductsQuery : IRequest<GetLowStockProductsResponseDto>
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQueryHandler.cs
index 48c84fc..b04a1d2 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetLowStockProducts/GetLowStockProductsQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Queries.GetLowStockProducts;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductGallery/GetProductGalleryQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductGallery/GetProductGalleryQueryHandler.cs
index 5ef5562..1c7bb71 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductGallery/GetProductGalleryQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductGallery/GetProductGalleryQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.ProductGalleries;
 using CMSMicroservice.Protobuf.Protos.ProductImages;
 
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProducts/GetProductsQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProducts/GetProductsQueryHandler.cs
index 2dd1b48..21c19a6 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProducts/GetProductsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProducts/GetProductsQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.Products;
 
 namespace BackOffice.BFF.Application.ProductsCQ.Queries.GetProducts;
diff --git a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductsForCategory/GetProductsForCategoryQueryHandler.cs b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductsForCategory/GetProductsForCategoryQueryHandler.cs
index 2dcec8c..eb6b96d 100644
--- a/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductsForCategory/GetProductsForCategoryQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/ProductsCQ/Queries/GetProductsForCategory/GetProductsForCategoryQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSProducts = CMSMicroservice.Protobuf.Protos.Products;
 using CMSProductCategory = CMSMicroservice.Protobuf.Protos.ProductCategory;
 
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs
index d9113b2..2360ca9 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs
@@ -1,15 +1,14 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.ArchiveMessage;
 
-public class ArchiveMessageCommand : IRequest<BffProto.ArchiveMessageResponse>
+public class ArchiveMessageCommand : IRequest<ArchiveMessageResponse>
 {
     public long MessageId { get; set; }
 }
 
-public class ArchiveMessageCommandHandler : IRequestHandler<ArchiveMessageCommand, BffProto.ArchiveMessageResponse>
+public class ArchiveMessageCommandHandler : IRequestHandler<ArchiveMessageCommand, ArchiveMessageResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -18,7 +17,7 @@ public class ArchiveMessageCommandHandler : IRequestHandler<ArchiveMessageComman
         _context = context;
     }
 
-    public async Task<BffProto.ArchiveMessageResponse> Handle(ArchiveMessageCommand request, CancellationToken cancellationToken)
+    public async Task<ArchiveMessageResponse> Handle(ArchiveMessageCommand request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.ArchiveMessageRequest
         {
@@ -29,7 +28,7 @@ public class ArchiveMessageCommandHandler : IRequestHandler<ArchiveMessageComman
             cmsRequest,
             cancellationToken: cancellationToken);
 
-        return new BffProto.ArchiveMessageResponse
+        return new ArchiveMessageResponse
         {
             Success = cmsResponse.Success,
             Message = cmsResponse.Message,
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommand.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommand.cs
index b6c6107..edc7bbe 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommand.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommand.cs
@@ -1,9 +1,8 @@
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.CreatePublicMessage;
 
-public record CreatePublicMessageCommand : IRequest<BffProto.CreatePublicMessageResponse>
+public record CreatePublicMessageCommand : IRequest<CreatePublicMessageResponse>
 {
     public string Title { get; init; } = string.Empty;
     public string Content { get; init; } = string.Empty;
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandHandler.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandHandler.cs
index d72f231..22ff361 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandHandler.cs
@@ -1,12 +1,9 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.CreatePublicMessage;
 
-public class CreatePublicMessageCommandHandler : IRequestHandler<CreatePublicMessageCommand, BffProto.CreatePublicMessageResponse>
+public class CreatePublicMessageCommandHandler : IRequestHandler<CreatePublicMessageCommand, CreatePublicMessageResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -15,7 +12,7 @@ public class CreatePublicMessageCommandHandler : IRequestHandler<CreatePublicMes
         _context = context;
     }
 
-    public async Task<BffProto.CreatePublicMessageResponse> Handle(CreatePublicMessageCommand request, CancellationToken cancellationToken)
+    public async Task<CreatePublicMessageResponse> Handle(CreatePublicMessageCommand request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.CreatePublicMessageRequest
         {
@@ -31,7 +28,7 @@ public class CreatePublicMessageCommandHandler : IRequestHandler<CreatePublicMes
             cmsRequest,
             cancellationToken: cancellationToken);
 
-        return new BffProto.CreatePublicMessageResponse
+        return new CreatePublicMessageResponse
         {
             Success = true,
             Message = "پیام با موفقیت ایجاد شد",
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommand.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommand.cs
index 113c4df..09db50d 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommand.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommand.cs
@@ -1,9 +1,8 @@
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.DeletePublicMessage;
 
-public record DeletePublicMessageCommand : IRequest<BffProto.DeletePublicMessageResponse>
+public record DeletePublicMessageCommand : IRequest<DeletePublicMessageResponse>
 {
     public long MessageId { get; init; }
 }
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommandHandler.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommandHandler.cs
index 144a96b..d0c01c2 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/DeletePublicMessage/DeletePublicMessageCommandHandler.cs
@@ -1,11 +1,9 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.DeletePublicMessage;
 
-public class DeletePublicMessageCommandHandler : IRequestHandler<DeletePublicMessageCommand, BffProto.DeletePublicMessageResponse>
+public class DeletePublicMessageCommandHandler : IRequestHandler<DeletePublicMessageCommand, DeletePublicMessageResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -14,7 +12,7 @@ public class DeletePublicMessageCommandHandler : IRequestHandler<DeletePublicMes
         _context = context;
     }
 
-    public async Task<BffProto.DeletePublicMessageResponse> Handle(DeletePublicMessageCommand request, CancellationToken cancellationToken)
+    public async Task<DeletePublicMessageResponse> Handle(DeletePublicMessageCommand request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.DeletePublicMessageRequest
         {
@@ -25,7 +23,7 @@ public class DeletePublicMessageCommandHandler : IRequestHandler<DeletePublicMes
             cmsRequest,
             cancellationToken: cancellationToken);
 
-        return new BffProto.DeletePublicMessageResponse
+        return new DeletePublicMessageResponse
         {
             Success = true,
             Message = "پیام با موفقیت حذف شد"
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommand.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommand.cs
index ffaeebd..ea55c2f 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommand.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommand.cs
@@ -1,9 +1,8 @@
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.PublishMessage;
 
-public record PublishMessageCommand : IRequest<BffProto.PublishMessageResponse>
+public record PublishMessageCommand : IRequest<PublishMessageResponse>
 {
     public long MessageId { get; init; }
 }
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs
index 909534e..c60e200 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs
@@ -1,11 +1,9 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.PublishMessage;
 
-public class PublishMessageCommandHandler : IRequestHandler<PublishMessageCommand, BffProto.PublishMessageResponse>
+public class PublishMessageCommandHandler : IRequestHandler<PublishMessageCommand, PublishMessageResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -14,7 +12,7 @@ public class PublishMessageCommandHandler : IRequestHandler<PublishMessageComman
         _context = context;
     }
 
-    public async Task<BffProto.PublishMessageResponse> Handle(PublishMessageCommand request, CancellationToken cancellationToken)
+    public async Task<PublishMessageResponse> Handle(PublishMessageCommand request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.PublishMessageRequest
         {
@@ -25,7 +23,7 @@ public class PublishMessageCommandHandler : IRequestHandler<PublishMessageComman
             cmsRequest,
             cancellationToken: cancellationToken);
 
-        return new BffProto.PublishMessageResponse
+        return new PublishMessageResponse
         {
             Success = cmsResponse.Success,
             Message = cmsResponse.Message,
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommand.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommand.cs
index 98a2ba3..92919de 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommand.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommand.cs
@@ -1,9 +1,8 @@
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.UpdatePublicMessage;
 
-public record UpdatePublicMessageCommand : IRequest<BffProto.UpdatePublicMessageResponse>
+public record UpdatePublicMessageCommand : IRequest<UpdatePublicMessageResponse>
 {
     public long MessageId { get; init; }
     public string Title { get; init; } = string.Empty;
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommandHandler.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommandHandler.cs
index 25dbe86..22d2c80 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Commands/UpdatePublicMessage/UpdatePublicMessageCommandHandler.cs
@@ -1,12 +1,9 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Commands.UpdatePublicMessage;
 
-public class UpdatePublicMessageCommandHandler : IRequestHandler<UpdatePublicMessageCommand, BffProto.UpdatePublicMessageResponse>
+public class UpdatePublicMessageCommandHandler : IRequestHandler<UpdatePublicMessageCommand, UpdatePublicMessageResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -15,7 +12,7 @@ public class UpdatePublicMessageCommandHandler : IRequestHandler<UpdatePublicMes
         _context = context;
     }
 
-    public async Task<BffProto.UpdatePublicMessageResponse> Handle(UpdatePublicMessageCommand request, CancellationToken cancellationToken)
+    public async Task<UpdatePublicMessageResponse> Handle(UpdatePublicMessageCommand request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.UpdatePublicMessageRequest
         {
@@ -32,7 +29,7 @@ public class UpdatePublicMessageCommandHandler : IRequestHandler<UpdatePublicMes
             cmsRequest,
             cancellationToken: cancellationToken);
 
-        return new BffProto.UpdatePublicMessageResponse
+        return new UpdatePublicMessageResponse
         {
             Success = true,
             Message = "پیام با موفقیت به‌روزرسانی شد"
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQuery.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQuery.cs
index 1ec91dc..fb46e30 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQuery.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQuery.cs
@@ -1,18 +1,17 @@
 // GetActiveMessages - Public view
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Queries.GetActiveMessages;
 
-public record GetActiveMessagesQuery : IRequest<BffProto.GetActiveMessagesResponse>
+public record GetActiveMessagesQuery : IRequest<GetActiveMessagesResponse>
 {
     public int? MessageType { get; init; }
     public string? TargetAudience { get; init; }
 }
 
-public class GetActiveMessagesQueryHandler : IRequestHandler<GetActiveMessagesQuery, BffProto.GetActiveMessagesResponse>
+public class GetActiveMessagesQueryHandler : IRequestHandler<GetActiveMessagesQuery, GetActiveMessagesResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -21,18 +20,18 @@ public class GetActiveMessagesQueryHandler : IRequestHandler<GetActiveMessagesQu
         _context = context;
     }
 
-    public async Task<BffProto.GetActiveMessagesResponse> Handle(GetActiveMessagesQuery request, CancellationToken cancellationToken)
+    public async Task<GetActiveMessagesResponse> Handle(GetActiveMessagesQuery request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.GetActiveMessagesRequest();
 
         // نسخه فعلی CMS فیلدی برای فیلتر ندارد؛ در صورت اضافه شدن، اینجا مپ می‌شود.
         var cmsResponse = await _context.PublicMessages.GetActiveMessagesAsync(cmsRequest, cancellationToken: cancellationToken);
 
-        var result = new BffProto.GetActiveMessagesResponse();
+        var result = new GetActiveMessagesResponse();
 
         foreach (var message in cmsResponse.Messages)
         {
-            result.Messages.Add(new BffProto.PublicMessageDto
+            result.Messages.Add(new PublicMessageDto
             {
                 MessageId = message.Id,
                 Title = message.Title,
diff --git a/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQuery.cs b/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQuery.cs
index 520d634..985af2c 100644
--- a/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQuery.cs
+++ b/src/BackOffice.BFF.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQuery.cs
@@ -1,13 +1,11 @@
 // GetAllMessages - Admin view
-using BackOffice.BFF.Application.Common.Interfaces;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
-using BffProto = BackOffice.BFF.PublicMessage.Protobuf;
+
+using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
 using CmsProto = CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.PublicMessageCQ.Queries.GetAllMessages;
 
-public record GetAllMessagesQuery : IRequest<BffProto.GetAllMessagesResponse>
+public record GetAllMessagesQuery : IRequest<GetAllMessagesResponse>
 {
     public int? Status { get; init; }
     public int? MessageType { get; init; }
@@ -15,7 +13,7 @@ public record GetAllMessagesQuery : IRequest<BffProto.GetAllMessagesResponse>
     public int PageSize { get; init; }
 }
 
-public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, BffProto.GetAllMessagesResponse>
+public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, GetAllMessagesResponse>
 {
     private readonly IApplicationContractContext _context;
 
@@ -24,7 +22,7 @@ public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, B
         _context = context;
     }
 
-    public async Task<BffProto.GetAllMessagesResponse> Handle(GetAllMessagesQuery request, CancellationToken cancellationToken)
+    public async Task<GetAllMessagesResponse> Handle(GetAllMessagesQuery request, CancellationToken cancellationToken)
     {
         var cmsRequest = new CmsProto.GetAllMessagesRequest
         {
@@ -44,7 +42,7 @@ public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, B
 
         var cmsResponse = await _context.PublicMessages.GetAllMessagesAsync(cmsRequest, cancellationToken: cancellationToken);
 
-        var result = new BffProto.GetAllMessagesResponse
+        var result = new GetAllMessagesResponse
         {
             TotalCount = (int)cmsResponse.MetaData.TotalCount,
             PageNumber = request.PageNumber,
@@ -53,7 +51,7 @@ public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, B
 
         foreach (var message in cmsResponse.Messages)
         {
-            result.Messages.Add(new BffProto.AdminPublicMessageDto
+            result.Messages.Add(new AdminPublicMessageDto
             {
                 MessageId = message.Id,
                 Title = message.Title,
diff --git a/src/BackOffice.BFF.Application/RoleCQ/Commands/CreateNewRole/CreateNewRoleCommandHandler.cs b/src/BackOffice.BFF.Application/RoleCQ/Commands/CreateNewRole/CreateNewRoleCommandHandler.cs
index f5a126c..d1c1487 100644
--- a/src/BackOffice.BFF.Application/RoleCQ/Commands/CreateNewRole/CreateNewRoleCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/RoleCQ/Commands/CreateNewRole/CreateNewRoleCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Commands.CreateNewUser;
 using CMSMicroservice.Protobuf.Protos.Role;
 
 namespace BackOffice.BFF.Application.RoleCQ.Commands.CreateNewRole;
diff --git a/src/BackOffice.BFF.Application/RoleCQ/Queries/GetAllRoleByFilter/GetAllRoleByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/RoleCQ/Queries/GetAllRoleByFilter/GetAllRoleByFilterQueryHandler.cs
index 510a3da..357e7d8 100644
--- a/src/BackOffice.BFF.Application/RoleCQ/Queries/GetAllRoleByFilter/GetAllRoleByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/RoleCQ/Queries/GetAllRoleByFilter/GetAllRoleByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.RoleCQ.Queries.GetAllRoleByFilter;
 using CMSMicroservice.Protobuf.Protos.Role;
 
 namespace BackOffice.BFF.Application.RoleCQ.Queries.GetAllRoleByFilter;
diff --git a/src/BackOffice.BFF.Application/RoleCQ/Queries/GetRole/GetRoleQueryHandler.cs b/src/BackOffice.BFF.Application/RoleCQ/Queries/GetRole/GetRoleQueryHandler.cs
index 1e91d5f..7dbb460 100644
--- a/src/BackOffice.BFF.Application/RoleCQ/Queries/GetRole/GetRoleQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/RoleCQ/Queries/GetRole/GetRoleQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.RoleCQ.Queries.GetRole;
 using CMSMicroservice.Protobuf.Protos.Role;
 
 namespace BackOffice.BFF.Application.RoleCQ.Queries.GetRole;
diff --git a/src/BackOffice.BFF.Application/TagCQ/Commands/CreateTag/CreateTagCommand.cs b/src/BackOffice.BFF.Application/TagCQ/Commands/CreateTag/CreateTagCommand.cs
index 8940910..27c2ccc 100644
--- a/src/BackOffice.BFF.Application/TagCQ/Commands/CreateTag/CreateTagCommand.cs
+++ b/src/BackOffice.BFF.Application/TagCQ/Commands/CreateTag/CreateTagCommand.cs
@@ -1,5 +1,3 @@
-using CMSMicroservice.Protobuf.Protos.Tag;
-
 namespace BackOffice.BFF.Application.TagCQ.Commands.CreateTag;
 
 public record CreateTagCommand : IRequest<long>
diff --git a/src/BackOffice.BFF.Application/TagCQ/Commands/UpdateTag/UpdateTagCommand.cs b/src/BackOffice.BFF.Application/TagCQ/Commands/UpdateTag/UpdateTagCommand.cs
index 784db27..9badd5b 100644
--- a/src/BackOffice.BFF.Application/TagCQ/Commands/UpdateTag/UpdateTagCommand.cs
+++ b/src/BackOffice.BFF.Application/TagCQ/Commands/UpdateTag/UpdateTagCommand.cs
@@ -1,5 +1,3 @@
-using CMSMicroservice.Protobuf.Protos.Tag;
-
 namespace BackOffice.BFF.Application.TagCQ.Commands.UpdateTag;
 
 public record UpdateTagCommand : IRequest
diff --git a/src/BackOffice.BFF.Application/TagCQ/Queries/GetAllTags/GetAllTagsQueryHandler.cs b/src/BackOffice.BFF.Application/TagCQ/Queries/GetAllTags/GetAllTagsQueryHandler.cs
index fa893e5..6bf08d9 100644
--- a/src/BackOffice.BFF.Application/TagCQ/Queries/GetAllTags/GetAllTagsQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/TagCQ/Queries/GetAllTags/GetAllTagsQueryHandler.cs
@@ -1,6 +1,4 @@
 using CMSMicroservice.Protobuf.Protos.Tag;
-using Google.Protobuf.WellKnownTypes;
-using CMSMicroservice.Protobuf.Protos;
 
 namespace BackOffice.BFF.Application.TagCQ.Queries.GetAllTags;
 
diff --git a/src/BackOffice.BFF.Application/UserAddressCQ/Commands/CreateNewUserAddress/CreateNewUserAddressCommandHandler.cs b/src/BackOffice.BFF.Application/UserAddressCQ/Commands/CreateNewUserAddress/CreateNewUserAddressCommandHandler.cs
index 72c5d51..d82dc9e 100644
--- a/src/BackOffice.BFF.Application/UserAddressCQ/Commands/CreateNewUserAddress/CreateNewUserAddressCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserAddressCQ/Commands/CreateNewUserAddress/CreateNewUserAddressCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Commands.CreateNewUser;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 
 namespace BackOffice.BFF.Application.UserAddressCQ.Commands.CreateNewUserAddress;
diff --git a/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetAllUserAddressByFilter/GetAllUserAddressByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetAllUserAddressByFilter/GetAllUserAddressByFilterQueryHandler.cs
index 465993e..ecb75e2 100644
--- a/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetAllUserAddressByFilter/GetAllUserAddressByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetAllUserAddressByFilter/GetAllUserAddressByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetAllUserByFilter;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 
 namespace BackOffice.BFF.Application.UserAddressCQ.Queries.GetAllUserAddressByFilter;
diff --git a/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetUserAddress/GetUserAddressQueryHandler.cs b/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetUserAddress/GetUserAddressQueryHandler.cs
index 2853d1a..0ac7b56 100644
--- a/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetUserAddress/GetUserAddressQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserAddressCQ/Queries/GetUserAddress/GetUserAddressQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetUser;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 
 namespace BackOffice.BFF.Application.UserAddressCQ.Queries.GetUserAddress;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommand.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommand.cs
index 5541581..a8677df 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommand.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommand.cs
@@ -1,4 +1,3 @@
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.ApplyDiscountToOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs
index a2c26a6..7dc2002 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using CmsProto = CMSMicroservice.Protobuf.Protos.UserOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandValidator.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandValidator.cs
index 62ecb1a..f9eb13c 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandValidator.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandValidator.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.ApplyDiscountToOrder;
 
 public class ApplyDiscountToOrderCommandValidator : AbstractValidator<ApplyDiscountToOrderCommand>
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommand.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommand.cs
index b615207..74336d8 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommand.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommand.cs
@@ -1,4 +1,3 @@
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.CancelOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs
index 3f96d95..044954f 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using CmsProto = CMSMicroservice.Protobuf.Protos.UserOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandValidator.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandValidator.cs
index 8c5b385..37a6d2c 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandValidator.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandValidator.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.CancelOrder;
 
 public class CancelOrderCommandValidator : AbstractValidator<CancelOrderCommand>
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs
index fe53cc1..d57f58a 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Commands.CreateNewUser;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.CreateNewUserOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommand.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommand.cs
index 6fb3ed6..1563ed5 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommand.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommand.cs
@@ -1,4 +1,3 @@
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.UpdateOrderStatus;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs
index 352cade..b285016 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
 using Microsoft.Extensions.Logging;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using CmsProto = CMSMicroservice.Protobuf.Protos.UserOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandValidator.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandValidator.cs
index 5ece8c8..90e8172 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandValidator.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandValidator.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.UpdateOrderStatus;
 
 public class UpdateOrderStatusCommandValidator : AbstractValidator<UpdateOrderStatusCommand>
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandHandler.cs
index f96648d..09f8c5e 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Commands.UpdateUserOrder;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQuery.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQuery.cs
index e90503f..651d327 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQuery.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQuery.cs
@@ -1,4 +1,3 @@
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.CalculateOrderPV;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryHandler.cs
index ca01856..eb9816d 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryHandler.cs
@@ -1,5 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using CmsProto = CMSMicroservice.Protobuf.Protos.UserOrder;
 
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryValidator.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryValidator.cs
index 73e707a..5b11374 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryValidator.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/CalculateOrderPV/CalculateOrderPVQueryValidator.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.CalculateOrderPV;
 
 public class CalculateOrderPVQueryValidator : AbstractValidator<CalculateOrderPVQuery>
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
index 647af7f..9144703 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using PaginationState = BackOffice.BFF.Application.Common.Models.PaginationState;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQuery.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQuery.cs
index cb02889..4d73c45 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQuery.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQuery.cs
@@ -1,4 +1,3 @@
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.GetOrdersByDateRange;
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryHandler.cs
index 13512a0..a170ff8 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryHandler.cs
@@ -1,5 +1,3 @@
-using FluentValidation;
-
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.GetOrdersByDateRange;
 
 public class GetOrdersByDateRangeQueryValidator : AbstractValidator<GetOrdersByDateRangeQuery>
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs
index 9f151cf..4666e15 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs
@@ -1,6 +1,3 @@
-using BackOffice.BFF.Application.Common.Interfaces;
-using Google.Protobuf.WellKnownTypes;
-using MediatR;
 using BffProto = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 using CmsProto = CMSMicroservice.Protobuf.Protos.UserOrder;
 
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
index cf79d34..d179f0c 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetUser;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 
 namespace BackOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder;
diff --git a/src/BackOffice.BFF.Application/UserRoleCQ/Commands/CreateNewUserRole/CreateNewUserRoleCommandHandler.cs b/src/BackOffice.BFF.Application/UserRoleCQ/Commands/CreateNewUserRole/CreateNewUserRoleCommandHandler.cs
index 59d9120..d2df5b6 100644
--- a/src/BackOffice.BFF.Application/UserRoleCQ/Commands/CreateNewUserRole/CreateNewUserRoleCommandHandler.cs
+++ b/src/BackOffice.BFF.Application/UserRoleCQ/Commands/CreateNewUserRole/CreateNewUserRoleCommandHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Commands.CreateNewUser;
 using CMSMicroservice.Protobuf.Protos.UserRole;
 
 namespace BackOffice.BFF.Application.UserRoleCQ.Commands.CreateNewUserRole;
diff --git a/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetAllUserRoleByFilter/GetAllUserRoleByFilterQueryHandler.cs b/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetAllUserRoleByFilter/GetAllUserRoleByFilterQueryHandler.cs
index 0baaea4..a87893b 100644
--- a/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetAllUserRoleByFilter/GetAllUserRoleByFilterQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetAllUserRoleByFilter/GetAllUserRoleByFilterQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetAllUserByFilter;
 using CMSMicroservice.Protobuf.Protos.UserRole;
 
 namespace BackOffice.BFF.Application.UserRoleCQ.Queries.GetAllUserRoleByFilter;
diff --git a/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetUserRole/GetUserRoleQueryHandler.cs b/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetUserRole/GetUserRoleQueryHandler.cs
index 155a33e..6f91104 100644
--- a/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetUserRole/GetUserRoleQueryHandler.cs
+++ b/src/BackOffice.BFF.Application/UserRoleCQ/Queries/GetUserRole/GetUserRoleQueryHandler.cs
@@ -1,4 +1,3 @@
-using BackOffice.BFF.Application.UserCQ.Queries.GetUser;
 using CMSMicroservice.Protobuf.Protos.UserRole;
 
 namespace BackOffice.BFF.Application.UserRoleCQ.Queries.GetUserRole;
diff --git a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
index 34957fa..10eded6 100644
--- a/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
+++ b/src/BackOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
@@ -12,8 +12,6 @@ using CMSMicroservice.Protobuf.Protos.Category;
 using CMSMicroservice.Protobuf.Protos.ProductCategory;
 using BackOffice.BFF.Commission.Protobuf;
 using BackOffice.BFF.NetworkMembership.Protobuf;
-using BackOffice.BFF.ClubMembership.Protobuf;
-using BackOffice.BFF.Configuration.Protobuf;
 using FMSMicroservice.Protobuf.Protos.FileInfo;
 using CMSMicroservice.Protobuf.Protos.DiscountProduct;
 using CMSMicroservice.Protobuf.Protos.DiscountCategory;
@@ -22,6 +20,8 @@ using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 using CMSMicroservice.Protobuf.Protos.Tag;
 using CMSMicroservice.Protobuf.Protos.ProductTag;
 using CMSMicroservice.Protobuf.Protos;
+using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Protobuf.Protos.Configuration;
 using CMSMicroservice.Protobuf.Protos.ManualPayment;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/BackOffice.BFF.WebApi/Services/HealthService.cs b/src/BackOffice.BFF.WebApi/Services/HealthService.cs
index 6b80b2d..e4ebeac 100644
--- a/src/BackOffice.BFF.WebApi/Services/HealthService.cs
+++ b/src/BackOffice.BFF.WebApi/Services/HealthService.cs
@@ -1,6 +1,6 @@
 using BackOffice.BFF.Application.HealthCQ.Queries.GetSystemHealth;
 using BackOffice.BFF.WebApi.Common.Services;
-using BackOffice.BFF.Health.Protobuf;
+using Foursat.BackOffice.BFF.Health.Protobuf;
 using Grpc.Core;
 
 namespace BackOffice.BFF.WebApi.Services;