Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Code cleanup - remove unused using

KrzysztofPajakc3dd52ce2115
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index 0dd8bb307..c0137a52f 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -1,7 +1,6 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Catalog.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index ed12efbe6..d06c7e45e 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -1,7 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Storage.Interfaces;
using MediatR;
-using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
index 3f58a3ab1..0f2fd7bb5 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
@@ -1,5 +1,4 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Domain.Catalog;
diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.cs
index dbc2307ac..219a7d4a8 100644
--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PictureController.cs
@@ -7,7 +7,6 @@ using Grand.Business.Common.Services.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
index daba58487..c5d49eba3 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
using Grand.Infrastructure.Validators;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
index 7dc8fc152..a9529cc4d 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
@@ -1,9 +1,4 @@
-using Grand.Domain.Customers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
index 8f1c4ce2a..4208dd3a5 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
@@ -1,10 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Security;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Security.Claims;
-using System.Text;
using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
diff --git a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
index 6efd91c2c..b32a254c7 100644
--- a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
@@ -4,12 +4,9 @@ using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Common.Services.Security;
using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
-using Grand.Domain.Security;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
diff --git a/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs b/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs
index 3ba6ba696..a80ab1c00 100644
--- a/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs
+++ b/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using System.Security.Claims;
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
index c7a14b757..3bd57ca5c 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Catalog.Utilities;
using Grand.Domain;
using Grand.Domain.Catalog;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
index a43a24124..9fbf7ab16 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Catalog.Utilities;
using Grand.Domain;
using Grand.Domain.Catalog;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
index 9f42ed729..e93bac55b 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
@@ -1,6 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Seo;
using Grand.Business.Storage.Interfaces;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
index 28f3e89cc..bca90bd0a 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
@@ -9,7 +9,6 @@ using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-using Grand.Domain.Orders;
using Grand.SharedKernel.Extensions;
using System;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
index 7ac7b10ae..481817865 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
@@ -1,5 +1,4 @@
using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
using System;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
index 3c24da33e..b32482d9b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
@@ -1,9 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System;
using System.Collections.Generic;
-using System.Text;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
index f267bfc6f..5d5c41c99 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
@@ -1,5 +1,4 @@
-using Grand.Domain.Customers;
-using Grand.Domain.Orders;
+using Grand.Domain.Orders;
using System.Collections.Generic;
using System.Threading.Tasks;
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
index 530442094..d7719017c 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
@@ -1,5 +1,4 @@
using Grand.Business.Checkout.Services.Orders;
-using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
index 399ddfe84..1b2e17dea 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
@@ -1,6 +1,4 @@
using Grand.Domain;
-using Grand.Domain.Catalog;
-using Grand.Domain.Common;
using Grand.Domain.Shipping;
using System;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
index f43155d96..bcf013c82 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Orders;
using MediatR;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
index 918b3cbbf..830afd641 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
@@ -1,11 +1,7 @@
using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Domain.Orders;
using Grand.Domain.Payments;
using MediatR;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs
index fc92e1157..7edb64d06 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs
@@ -1,10 +1,5 @@
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs b/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
index ddc8a6119..7378d87cc 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
@@ -2,7 +2,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-using Grand.Domain.Shipping;
using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
diff --git a/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs b/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
index 48b43aff2..055d9ad27 100644
--- a/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Common;
-using System;
using System.Collections.Generic;
namespace Grand.Business.Common.Extensions
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
index 14775d8b4..667c1b0b0 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Common.Interfaces.Providers;
using Grand.Domain.Directory;
using System.Collections.Generic;
using System.Threading.Tasks;
diff --git a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
index a5f29ca82..d9fd70c09 100644
--- a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Interfaces.Security;
using Grand.Domain.Customers;
-using Grand.Domain.Security;
using System;
using System.IO;
using System.Security.Cryptography;
diff --git a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
index cbcf790e0..4c8e961cc 100644
--- a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Marketing.Extensions;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Domain;
-using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Knowledgebase;
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
index 15083984a..dc4e29318 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
@@ -1,6 +1,5 @@
using DotLiquid;
using Grand.Domain.Catalog;
-using Grand.Domain.Customers;
using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs b/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs
index d12f1ea49..3b7228636 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs
@@ -1,15 +1,4 @@
-using Grand.Domain.Blogs;
-using Grand.Domain.Catalog;
-using Grand.Domain.Customers;
-using Grand.Domain.Knowledgebase;
-using Grand.Domain.Localization;
-using Grand.Domain.Messages;
-using Grand.Domain.News;
-using Grand.Domain.Orders;
-using Grand.Domain.Shipping;
-using Grand.Domain.Stores;
-using Grand.Domain.Vendors;
-using System.Threading.Tasks;
+using Grand.Domain.Customers;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
index f87ee2e45..d54cb6c0c 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Messages.Interfaces;
-using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
index 148be7845..dd787fc8c 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
@@ -1,20 +1,6 @@
using Grand.Business.Messages.Interfaces;
-using Grand.Domain.Blogs;
-using Grand.Domain.Catalog;
using Grand.Domain.Customers;
-using Grand.Domain.Knowledgebase;
-using Grand.Domain.Localization;
-using Grand.Domain.Messages;
-using Grand.Domain.News;
-using Grand.Domain.Orders;
-using Grand.Domain.Shipping;
-using Grand.Domain.Stores;
-using Grand.Domain.Vendors;
using Grand.Business.Messages.DotLiquidDrops;
-using MediatR;
-using System.Threading.Tasks;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.Extensions;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Utilities/Token.cs b/src/Business/Grand.Business.Messages/Utilities/Token.cs
index 42dcd83f9..b36f48be9 100644
--- a/src/Business/Grand.Business.Messages/Utilities/Token.cs
+++ b/src/Business/Grand.Business.Messages/Utilities/Token.cs
@@ -1,5 +1,5 @@
namespace Grand.Business.Messages.Utilities
-{
+{
public sealed class Token
{
private readonly string _key;
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs b/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
index c1eeb5230..673316420 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Utilities;
using Grand.Domain;
-using Grand.Domain.Customers;
-using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using System;
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs b/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
index 1fc634e2b..f6255bebd 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
@@ -1,7 +1,6 @@
using Grand.Business.System.Utilities;
using Grand.Domain;
using Grand.Domain.Catalog;
-using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using System;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
index af4ed692f..960fe4a07 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
@@ -1,5 +1,4 @@
using Grand.Business.System.Interfaces.Installation;
-using Grand.Domain.Directory;
using Grand.Domain.Messages;
using System;
using System.Collections.Generic;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
index b4cee8793..1bec92410 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
@@ -1,5 +1,4 @@
using Grand.Business.System.Interfaces.Installation;
-using Grand.Domain.Directory;
using Grand.Domain.Tasks;
using System.Collections.Generic;
using System.Threading.Tasks;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
index 864d04a8d..c660d9da8 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure.Migrations;
-using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Linq;
diff --git a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs b/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs
index 570fb38b5..187125280 100644
--- a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs
+++ b/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs
@@ -1,5 +1,3 @@
-using Grand.Domain.Orders;
-
namespace Grand.Business.System.Utilities
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs b/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs
index f963d225f..4287c7315 100644
--- a/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Localization;
-using System;
using System.Collections.Generic;
namespace Grand.Domain.Catalog
diff --git a/src/Core/Grand.Domain/Customers/CustomerTagProduct.cs b/src/Core/Grand.Domain/Customers/CustomerTagProduct.cs
index 301921b38..48576ebed 100644
--- a/src/Core/Grand.Domain/Customers/CustomerTagProduct.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerTagProduct.cs
@@ -1,6 +1,6 @@
namespace Grand.Domain.Customers
{
-
+
/// <summary>
/// Represents a customer tag product
/// </summary>
diff --git a/src/Core/Grand.Domain/Customers/HashedPasswordFormat.cs b/src/Core/Grand.Domain/Customers/HashedPasswordFormat.cs
index cd2eec6b7..86c2df71d 100644
--- a/src/Core/Grand.Domain/Customers/HashedPasswordFormat.cs
+++ b/src/Core/Grand.Domain/Customers/HashedPasswordFormat.cs
@@ -1,5 +1,5 @@
-namespace Grand.Domain.Customers
-{
+namespace Grand.Domain.Customers
+{
public enum HashedPasswordFormat
{
SHA1,
diff --git a/src/Core/Grand.Domain/Customers/PasswordFormat.cs b/src/Core/Grand.Domain/Customers/PasswordFormat.cs
index 00d0cfdd7..23ae4cf15 100644
--- a/src/Core/Grand.Domain/Customers/PasswordFormat.cs
+++ b/src/Core/Grand.Domain/Customers/PasswordFormat.cs
@@ -1,5 +1,5 @@
-namespace Grand.Domain.Customers
-{
+namespace Grand.Domain.Customers
+{
public enum PasswordFormat
{
Clear = 0,
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs b/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
index a9a22f9b8..f036dbb14 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
@@ -1,5 +1,4 @@
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization;
using MongoDB.Bson.Serialization.Conventions;
using MongoDB.Bson.Serialization.Options;
using MongoDB.Bson.Serialization.Serializers;
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
index 7b7889735..4f6ad381c 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Security/RefreshToken.cs b/src/Core/Grand.Domain/Security/RefreshToken.cs
index 66c0f3f5a..8446753bb 100644
--- a/src/Core/Grand.Domain/Security/RefreshToken.cs
+++ b/src/Core/Grand.Domain/Security/RefreshToken.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Domain.Security
{
diff --git a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
index a3da19c08..32ef468da 100644
--- a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
@@ -2,9 +2,7 @@
using MediatR;
using Microsoft.Extensions.Caching.Memory;
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Threading.Tasks;
namespace Grand.Infrastructure.Caching.Redis
diff --git a/src/Core/Grand.Infrastructure/Configuration/GrandWebApiConfig.cs b/src/Core/Grand.Infrastructure/Configuration/GrandWebApiConfig.cs
index 79ba95f0e..1e1ff2d08 100644
--- a/src/Core/Grand.Infrastructure/Configuration/GrandWebApiConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/GrandWebApiConfig.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Configuration
+namespace Grand.Infrastructure.Configuration
{
public class GrandWebApiConfig
{
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
index e4c0c5130..6512927f2 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
@@ -1,12 +1,8 @@
using Grand.Domain.Security;
using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
-using System.Linq;
-using System.Text;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.TypeConverters.Converter
{
diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthConfig.cs b/src/Plugins/Authentication.Facebook/FacebookAuthConfig.cs
index 5f4212298..c41b4f08d 100644
--- a/src/Plugins/Authentication.Facebook/FacebookAuthConfig.cs
+++ b/src/Plugins/Authentication.Facebook/FacebookAuthConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Authentication.Facebook
+namespace Authentication.Facebook
{
class FacebookAuthConfig
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index 55137f051..019d795a5 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -1,7 +1,6 @@
using DiscountRules.HasOneProduct.Models;
using DiscountRules.Standard.Models;
using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
index ac5f0c0fb..86ca8ff7d 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
@@ -4,7 +4,6 @@ using Grand.Business.Catalog.Utilities;
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
-using Grand.Domain.Customers;
using Grand.Domain.Orders;
using System;
using System.Linq;
diff --git a/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs b/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
index 0f335aa2c..f3d9560f5 100644
--- a/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
@@ -1,5 +1,4 @@
-using Grand.Web.Common.Localization;
-using Grand.Web.Common.Models;
+using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using System.Collections.Generic;
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index bc99133ee..1d989d6b8 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -15,14 +15,10 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Net.Http.Headers;
using System;
using System.Collections.Generic;
using System.Globalization;
-using System.IO;
using System.Linq;
-using System.Net;
-using System.Text;
using System.Threading.Tasks;
namespace Payments.PayPalStandard
diff --git a/src/Plugins/Payments.PayPalStandard/PaypalHelper.cs b/src/Plugins/Payments.PayPalStandard/PaypalHelper.cs
index 5f6c4e97d..d774b738c 100644
--- a/src/Plugins/Payments.PayPalStandard/PaypalHelper.cs
+++ b/src/Plugins/Payments.PayPalStandard/PaypalHelper.cs
@@ -1,8 +1,4 @@
using Grand.Domain.Payments;
-using Microsoft.AspNetCore.Http;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard
{
diff --git a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
index 4df82068b..18b9672f0 100644
--- a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
+++ b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Shipping.ByWeight.Domain;
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
diff --git a/src/Plugins/Widgets.Slider/Extensions.cs b/src/Plugins/Widgets.Slider/Extensions.cs
index 8a7a3cd6f..9443c76b1 100644
--- a/src/Plugins/Widgets.Slider/Extensions.cs
+++ b/src/Plugins/Widgets.Slider/Extensions.cs
@@ -1,16 +1,9 @@
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Web.Common.Localization;
-using Grand.Web.Common.Link;
-using Grand.Web.Common.Models;
+using Grand.Web.Common.Models;
using Grand.Domain.Localization;
-using Grand.Domain.Stores;
using Grand.Infrastructure.Mapper;
-using Grand.Infrastructure.Models;
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
index 1fc21a474..08b843e77 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
@@ -10,8 +10,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using Grand.Domain.Catalog;
using Grand.SharedKernel.Extensions;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
index a6dfd5bf0..582024dcc 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
@@ -7,9 +7,6 @@ using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
index 9558984bd..54935ed3b 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
@@ -1,10 +1,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.Migrations
{
diff --git a/src/Web/Grand.Web.Admin/Components/Affiliate.cs b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
index d6e2bf159..81af902b3 100644
--- a/src/Web/Grand.Web.Admin/Components/Affiliate.cs
+++ b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
@@ -1,5 +1,4 @@
-using Grand.Domain.Orders;
-using Grand.Domain.Payments;
+using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Web.Common.Components;
using Grand.Web.Common.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
index 9bd1de40f..f1f8d8f23 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Common.Services.Security;
using Grand.Business.Customers.Interfaces;
using Grand.Business.Marketing.Interfaces.Documents;
-using Grand.Domain.Common;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
@@ -12,7 +11,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System;
using System.Linq;
using System.Threading.Tasks;
diff --git a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
index a938c8bc8..3735fec26 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
@@ -1,5 +1,4 @@
using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PageController.cs b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
index acc5f8aa0..1738abfff 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
@@ -2,9 +2,7 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
using Grand.Infrastructure;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
index bb1b8a0ab..211afb5b7 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Commands.Models.Security;
-using Grand.Web.Common.Filters;
using Grand.Web.Common.Models;
using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Permissions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
index 4f722a76e..a4a1b0a64 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
@@ -1,5 +1,4 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
+using Grand.Business.Catalog.Interfaces.Prices;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Common.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index 1a2f1eb22..945405594 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -13,7 +13,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Directory;
using Grand.Domain.Shipping;
using Grand.Infrastructure;
-using Grand.Infrastructure.Plugins;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Directory;
using Grand.Web.Admin.Models.Shipping;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
index cbe24501c..92278d391 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
@@ -6,7 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Stores;
using Grand.Business.Common.Services.Security;
using Grand.Business.Customers.Interfaces;
-using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs b/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
index 81614f619..1234e13b3 100644
--- a/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
@@ -1,12 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Domain;
-using Grand.Domain.Permissions;
+using Grand.Domain;
using Grand.Domain.Stores;
-using Grand.Infrastructure.Models;
-using Grand.Web.Common.Link;
-using Grand.Web.Common.Models;
using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs
index 5395d241a..d89d9e986 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Common;
-using Grand.Domain.Seo;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Settings;
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
index ebeebdda0..865237eef 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Catalog;
-using Grand.Domain.Media;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
using System.Threading.Tasks;
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
index c4275186c..4d5ecdee6 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Courses;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Courses;
-using Microsoft.AspNetCore.Http;
using System.Collections.Generic;
using System.Threading.Tasks;
diff --git a/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
index 18d8ae024..e9c14f12e 100644
--- a/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Blogs;
using Grand.Web.Admin.Models.Blogs;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Mapper/CountryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CountryProfile.cs
index 171c142a4..d99e0981c 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CountryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CountryProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Mapper/DiscountProfile.cs b/src/Web/Grand.Web.Admin/Mapper/DiscountProfile.cs
index 0bbfa8441..307983a8e 100644
--- a/src/Web/Grand.Web.Admin/Mapper/DiscountProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/DiscountProfile.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Discounts;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Discounts;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Mapper/KnowledgebaseCategoryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/KnowledgebaseCategoryProfile.cs
index a138b5ad9..d622ecb89 100644
--- a/src/Web/Grand.Web.Admin/Mapper/KnowledgebaseCategoryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/KnowledgebaseCategoryProfile.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Knowledgebase;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Knowledgebase;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Mapper/NewsletterCategoryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/NewsletterCategoryProfile.cs
index cbdfd5696..deaff5f48 100644
--- a/src/Web/Grand.Web.Admin/Mapper/NewsletterCategoryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/NewsletterCategoryProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Messages;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs b/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
index 283562b3b..3be614d95 100644
--- a/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
@@ -1,5 +1,4 @@
-using Grand.Web.Common.Localization;
-using Grand.Web.Common.Link;
+using Grand.Web.Common.Link;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using System;
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
index b6c7e4b3f..677b8ff44 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
@@ -1,5 +1,4 @@
-using Grand.Web.Common.Localization;
-using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using System.Collections.Generic;
using Grand.Web.Common.Link;
diff --git a/src/Web/Grand.Web.Admin/Models/Country/CountriesListModel.cs b/src/Web/Grand.Web.Admin/Models/Country/CountriesListModel.cs
index aaa68462f..efe0009d7 100644
--- a/src/Web/Grand.Web.Admin/Models/Country/CountriesListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Country/CountriesListModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Country
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerReviewModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerReviewModel.cs
index 36b87afb9..855c37834 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerReviewModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerReviewModel.cs
@@ -1,5 +1,4 @@
-using Grand.Infrastructure.Models;
-using Grand.Web.Admin.Models.Common;
+using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
index 41e26a337..9712be544 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs b/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
index 22def0554..2e8a1b3f3 100644
--- a/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using Grand.Web.Common.Models;
namespace Grand.Web.Admin.Models.Documents
{
diff --git a/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs b/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
index e3a3c1541..eace287fc 100644
--- a/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Collections.Generic;
-using Grand.Web.Common.Models;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Localization
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
index 9cdc91a8c..7a301f5c2 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
@@ -1,5 +1,4 @@
-using Grand.Web.Common.Localization;
-using Grand.Web.Common.Models;
+using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
index 214e8d3f1..ecfa3b5e1 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
@@ -1,5 +1,4 @@
-using Grand.Web.Common.Localization;
-using Grand.Web.Common.Link;
+using Grand.Web.Common.Link;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs b/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
index b562ac001..a5c2240e8 100644
--- a/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using Grand.Web.Common.Models;
using Grand.Web.Admin.Models.Directory;
using Grand.Web.Admin.Models.Shipping;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs b/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs
index b2e34a6b0..43c292f68 100644
--- a/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs
@@ -1,5 +1,4 @@
-using Grand.Infrastructure;
-using Grand.Domain;
+using Grand.Domain;
using System;
namespace Grand.Web.Admin.Models.PushNotifications
diff --git a/src/Web/Grand.Web.Admin/Models/PushNotifications/PushRegistrationGridModel.cs b/src/Web/Grand.Web.Admin/Models/PushNotifications/PushRegistrationGridModel.cs
index cad12ea30..22759f513 100644
--- a/src/Web/Grand.Web.Admin/Models/PushNotifications/PushRegistrationGridModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/PushNotifications/PushRegistrationGridModel.cs
@@ -1,5 +1,4 @@
-using Grand.Infrastructure;
-using Grand.Domain;
+using Grand.Domain;
using System;
namespace Grand.Web.Admin.Models.PushNotifications
diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
index f4abf4377..815e34979 100644
--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
@@ -1,6 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Directory;
@@ -12,7 +10,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
-using Grand.Domain.Customers;
using Grand.Domain.Seo;
using Grand.Web.Common.Extensions;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
index 78d5520e6..c91a5395c 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
@@ -1,10 +1,7 @@
using Grand.Infrastructure;
-using Grand.Domain.Customers;
-using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Web.Common.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Customers.Interfaces;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
diff --git a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
index fbaf5fb06..b3716ab21 100644
--- a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
@@ -1,5 +1,4 @@
-using Grand.Infrastructure;
-using Grand.Domain.Localization;
+using Grand.Domain.Localization;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
index f6ac27384..14a8ac09c 100644
--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
@@ -10,7 +10,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Business.Storage.Interfaces;
using Grand.Web.Common.Extensions;
using Grand.Domain.Common;
-using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
index dba2f8f02..ce93c22a5 100644
--- a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
@@ -5,7 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Seo;
using Grand.Business.Customers.Interfaces;
using Grand.Business.Storage.Interfaces;
-using Grand.Domain.Customers;
using Grand.Domain.News;
using Grand.Domain.Seo;
using Grand.Web.Common.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
index 931ae7a5a..6a8ff35a5 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
@@ -6,7 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Stores;
using Grand.Business.Customers.Interfaces;
using Grand.Domain.Catalog;
-using Grand.Domain.Customers;
using Grand.Web.Common.Extensions;
using Grand.SharedKernel.Extensions;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
index 4eeb459de..8b2968559 100644
--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
@@ -8,7 +8,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Business.Customers.Events;
using Grand.Business.Storage.Interfaces;
using Grand.Domain;
-using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Discounts;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
index 7c36e3716..190dcb576 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
@@ -1,8 +1,6 @@
using FluentValidation;
using Grand.Infrastructure;
-using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
index 3a283166e..b2419fb31 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
index fae5606d2..fcaf957a3 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
@@ -1,6 +1,5 @@
using FluentValidation;
using Grand.Infrastructure;
-using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
index 8bf284bdc..058ffc50b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
index 181679f5f..234eb6a8f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
index ec3212ef4..6b42c3aad 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
index 42334ec2c..bd0afa932 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
index a9e409e3f..d749bd224 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
index cb1de7919..0359675c3 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
index 4449463c8..383accef6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
index b6c29a9cd..c7f90b9d8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
@@ -1,6 +1,5 @@
using FluentValidation;
using Grand.Infrastructure;
-using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
index 0231c9304..912a481d9 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
index 19f036bcf..5051f55a4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
@@ -1,8 +1,6 @@
using FluentValidation;
using Grand.Infrastructure;
-using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
index 6b6fb2353..b1152485e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
index 00434546d..98c25a517 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Domain.Catalog;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
index eac4069d5..da3d2d164 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
index bd20375b0..14d0a3679 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
index 0fb1ae8c4..14376d964 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
index c8485e551..3f6a92a43 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
index 9c46cc198..081dbefa0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
index f26101d15..9529193aa 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
index f8296066a..2086f2ae3 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
index 9c4dac87b..d2f533db9 100644
--- a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Knowledgebase;
using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Admin.Validators.Knowledgebase
{
diff --git a/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs b/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs
index b141bf367..c806ade1a 100644
--- a/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs
@@ -2,7 +2,6 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Primitives;
-using System.Linq;
using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
diff --git a/src/Web/Grand.Web.Common/Page/Paging/IPageableModel.cs b/src/Web/Grand.Web.Common/Page/Paging/IPageableModel.cs
index b65d9a218..79eded2fe 100644
--- a/src/Web/Grand.Web.Common/Page/Paging/IPageableModel.cs
+++ b/src/Web/Grand.Web.Common/Page/Paging/IPageableModel.cs
@@ -2,10 +2,10 @@
namespace Grand.Web.Common.Page.Paging
{
- /// <summary>
- /// A collection of objects that has been split into pages.
- /// </summary>
- public interface IPageableModel
+ /// <summary>
+ /// A collection of objects that has been split into pages.
+ /// </summary>
+ public interface IPageableModel
{
/// <summary>
/// The current page index (starts from 0)
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
index d10d74c57..ad5cff278 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs
index 9826cc547..b0d2162e2 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text.Encodings.Web;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
index 02bfef9c6..25ca0f627 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Page.Paging;
-using Grand.Infrastructure.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
index 7b7acaa23..08cc8743e 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Grand.Web.Common.TagHelpers
{
-
+
[HtmlTargetElement("script", Attributes = LocationAttributeName)]
[HtmlTargetElement("script", Attributes = SrcAttributeName)]
[HtmlTargetElement("script", Attributes = OrderAttributeName)]
diff --git a/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
index 266aaf23a..99d0d22d6 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Grand.Web.Common.TagHelpers
{
-
+
[HtmlTargetElement("template", Attributes = AttributeNameHeader)]
[HtmlTargetElement("template", Attributes = AttributeNameFooter)]
public class TemplateTagHelper : TagHelper
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
index 92c4cafc2..0140c95b3 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Knowledgebase;
using Grand.Web.Common.Components;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
-using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
index 4176eab4d..c9859fc49 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Knowledgebase;
using Grand.Web.Common.Components;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
-using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
diff --git a/src/Web/Grand.Web/Components/PushNotificationsRegistration.cs b/src/Web/Grand.Web/Components/PushNotificationsRegistration.cs
index 7dc407bdd..f7137de45 100644
--- a/src/Web/Grand.Web/Components/PushNotificationsRegistration.cs
+++ b/src/Web/Grand.Web/Components/PushNotificationsRegistration.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure;
-using Grand.Domain.Customers;
using Grand.Domain.PushNotifications;
using Grand.Web.Common.Components;
using Grand.Web.Models.PushNotifications;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
index cf94c0e2b..2da768bca 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
@@ -6,7 +6,6 @@ using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
-using Grand.Business.Common.Interfaces.Seo;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
index 3fabf8156..5abc2a90b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
index f3317ea25..004b99c17 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
@@ -1,5 +1,4 @@
using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Extensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
index 4b4a93268..8984e1e4e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Stores;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
index 5b1ccde4b..6f946bf67 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
@@ -3,7 +3,6 @@ using Grand.Business.Checkout.Extensions;
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Storage.Interfaces;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
index afb82cfbd..293ff740c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
@@ -4,7 +4,6 @@ using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
-using Grand.Domain.Customers;
using Grand.Domain.Tax;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
index 58395276e..b888e517c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
@@ -11,7 +11,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Media;
using Grand.Domain.Orders;
-using Grand.SharedKernel.Extensions;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Products;
using Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
index 77f833afc..db9c03db1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
index 44b52f398..7f6b1d1ff 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
@@ -11,7 +11,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
-using Grand.Web.Extensions;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
index 18599ee56..93c59d42d 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
@@ -13,7 +13,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using Grand.Domain.Customers;
using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index ac75dee07..e3b75bdad 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -36,7 +36,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Routing;
using System;
using System.Collections.Generic;
-using System.Globalization;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index 3d6c077a6..63d1d5d66 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -22,7 +22,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Routing;
-using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
index 7ebf30459..7cd713efd 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionNavigation.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Grand.Domain.Customers;
+using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
index e1db60ee1..57c8ca505 100644
--- a/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
+++ b/src/Web/Grand.Web/Features/Models/Orders/GetMerchandiseReturn.cs
@@ -1,5 +1,4 @@
-using Grand.Domain.Customers;
-using Grand.Domain.Localization;
+using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
index d7bfffed7..fde6ca645 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
using MediatR;
using System.Collections.Generic;
diff --git a/src/Web/Grand.Web/Models/Customer/SubAccountSimpleModel.cs b/src/Web/Grand.Web/Models/Customer/SubAccountSimpleModel.cs
index 2ebdb37cc..e5aec7b69 100644
--- a/src/Web/Grand.Web/Models/Customer/SubAccountSimpleModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/SubAccountSimpleModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
index c86993d7f..2213bcf9a 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
@@ -1,5 +1,4 @@
using FluentValidation;
-using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
diff --git a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
index cf3c64e96..0129a4041 100644
--- a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
@@ -1,5 +1,4 @@
using FluentValidation;
-using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
index 0cc152b4c..ca4ad6003 100644
--- a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
@@ -1,5 +1,4 @@
using FluentValidation;
-using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
index a0ec2695d..e8789b7c5 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Vendors;
-using System;
using System.Collections.Generic;
using System.Linq;