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.

C# 10 - Global usings

KrzysztofPajak3c4d9b402a4c
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
index 78e010681..e15969c50 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Business.Common.Interfaces.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
index 6b8a9889d..ecd844615 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Business.Common.Interfaces.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
index fc551bfcc..7cb279711 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Business.Common.Interfaces.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
index 85cd4727b..3d0018f03 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
@@ -6,8 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
index 3a0b70c4b..036604641 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Api.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
index 7fb876461..03bc6b501 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Domain.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
index 033b0c9cf..0347de5c0 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Domain.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
index a97bf231f..ddef1e539 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Common.Interfaces.Seo;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Extensions;
using Grand.Infrastructure;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index f5763bebe..0a08e8328 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Storage.Interfaces;
using Grand.Domain.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
index fd2c52d53..05efcb8ab 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Domain.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
index 1fda0258d..774f78dad 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Api.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
index bb65e21d3..9ac105308 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
@@ -6,8 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
index 453e01bf8..fd2f53abd 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
index 03edda55b..71a2aaa10 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
index 088dc1eec..5fe5fafcf 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
index 9ab358f68..07e2a46f7 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
index 94cd367a5..0b93d2ea6 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Api.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
index f05d4e320..44a47f511 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
index 610dd1cc1..2ce088697 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
index deb52bf20..2c77ac283 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
index fe75a2320..1c6dfd7ce 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
@@ -1,9 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
index a48371a98..71b52015f 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
@@ -1,8 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
index cdbeeb6b0..fefeccaa2 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
@@ -1,8 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
index 32f6fde50..aebacad10 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index 305529e81..485d8f4e9 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -9,9 +9,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index e4e24232e..c1538141f 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -9,9 +9,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index d19c5ea1f..ece6b325a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -9,9 +9,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
index 90b2d1b6d..de67ee6c9 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
@@ -6,8 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
index 36cc52fdb..f3e4d5883 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Api.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
index 6ab090250..111797122 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
index e1ef8fd2d..4100a88ac 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index c0137a52f..c7415254d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -10,9 +10,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index d06c7e45e..c7507312b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -1,8 +1,5 @@
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
index 41fb1c9a0..5655190c7 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Domain.Catalog;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
index 0f2fd7bb5..92486437b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
@@ -4,11 +4,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
index 6a22c28db..85dec84aa 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Api.Extensions;
using Grand.Business.Catalog.Interfaces.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
index d9ec90046..aa8f736ab 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
@@ -6,9 +6,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
index e87c473d7..e7fbe630a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Api.DTOs.Common;
using Grand.Api.Extensions;
using Grand.Business.Storage.Interfaces;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Common
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
index c160c7339..e6f2d5b40 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Api.Commands.Models.Common;
using Grand.Business.Storage.Interfaces;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Common
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
index 5dde60f6a..f48bd378d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Api.Infrastructure.Extensions;
using Grand.Api.Jwt;
using Grand.Infrastructure.Configuration;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Common
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
index d136a25e1..aae785666 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/GenerateTokenWebCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Api.Infrastructure.Extensions;
using Grand.Api.Jwt;
using Grand.Infrastructure.Configuration;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Common
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
index 41a02af16..d48738a43 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -1,7 +1,5 @@
using Grand.Business.Storage.Interfaces;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Catalog
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
index 5880d5f71..8b16fff6a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
index 6ff33c2a5..e6985eb9a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
@@ -8,10 +8,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
index 848eff7ff..6bce2f6b1 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
@@ -5,8 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
index e5679e974..d03794583 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
@@ -1,9 +1,6 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
index d3e881bd8..c6d7e6c49 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Customers.Interfaces;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
index efa11398e..351fc13dc 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
index 61e620aa3..d5c0fb110 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
index bcc9dfbbd..2312f4a91 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
index 180e0d43f..c38d0b66e 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
@@ -5,8 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Commands.Models.Customers
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs b/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs
index 1a505ca56..4665dc9ec 100644
--- a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs
+++ b/src/API/Grand.Api/Commands/Models/Common/GenerateTokenCommand.cs
@@ -1,5 +1,4 @@
using MediatR;
-using System.Collections.Generic;
namespace Grand.Api.Commands.Models.Common
{
diff --git a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs b/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
index 2dd8948a0..2bf584094 100644
--- a/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
+++ b/src/API/Grand.Api/Commands/Models/Common/GenerateTokenWebCommand.cs
@@ -1,5 +1,4 @@
using MediatR;
-using System.Collections.Generic;
namespace Grand.Api.Commands.Models.Common
{
diff --git a/src/API/Grand.Api/Controllers/OData/BrandController.cs b/src/API/Grand.Api/Controllers/OData/BrandController.cs
index 343e4f9ad..ba5f9a89e 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandController.cs
+++ b/src/API/Grand.Api/Controllers/OData/BrandController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
index ab3b1e49c..6cda313b6 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
@@ -5,9 +5,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryController.cs b/src/API/Grand.Api/Controllers/OData/CategoryController.cs
index 64f8426b4..ad86342f0 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CategoryController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
index 459f65ce5..3983858b8 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
@@ -5,9 +5,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionController.cs b/src/API/Grand.Api/Controllers/OData/CollectionController.cs
index 744a78dec..6911c7a32 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CollectionController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
index 79aa80886..7974275c7 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
@@ -5,9 +5,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CountryController.cs b/src/API/Grand.Api/Controllers/OData/CountryController.cs
index 2306612a1..3689b0660 100644
--- a/src/API/Grand.Api/Controllers/OData/CountryController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CountryController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
index faf76e98e..9973d128b 100644
--- a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerController.cs b/src/API/Grand.Api/Controllers/OData/CustomerController.cs
index 6c068ee2d..3c436e55d 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CustomerController.cs
@@ -9,9 +9,7 @@ using Grand.Domain.Customers;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
index 389ca26aa..8c90dc217 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
index 424da2a2e..1ca2f7842 100644
--- a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
+++ b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/LanguageController.cs b/src/API/Grand.Api/Controllers/OData/LanguageController.cs
index ae1c8c1dd..17c188066 100644
--- a/src/API/Grand.Api/Controllers/OData/LanguageController.cs
+++ b/src/API/Grand.Api/Controllers/OData/LanguageController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
index dcafac111..0bae66802 100644
--- a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.cs
index f408460e6..acc8a1d9b 100644
--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PictureController.cs
@@ -8,7 +8,6 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
index 54215f02e..006786d36 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductController.cs b/src/API/Grand.Api/Controllers/OData/ProductController.cs
index ba9ae3d31..a7bd6b6a9 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
index d98609abd..b2223bfec 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
@@ -5,9 +5,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
index 6854d422e..49b4c96d0 100644
--- a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
index d380a2c5f..74f69270c 100644
--- a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
+++ b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
@@ -9,9 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Formatter;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs b/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs
index bcbc97ce8..327fa973d 100644
--- a/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs
+++ b/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/StoreController.cs b/src/API/Grand.Api/Controllers/OData/StoreController.cs
index bb21a2a98..e6d203587 100644
--- a/src/API/Grand.Api/Controllers/OData/StoreController.cs
+++ b/src/API/Grand.Api/Controllers/OData/StoreController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/VendorController.cs b/src/API/Grand.Api/Controllers/OData/VendorController.cs
index 5a7fdc475..4e8ac8325 100644
--- a/src/API/Grand.Api/Controllers/OData/VendorController.cs
+++ b/src/API/Grand.Api/Controllers/OData/VendorController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
index 375cb6007..1edcf772b 100644
--- a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
+++ b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
@@ -6,9 +6,7 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
using Swashbuckle.AspNetCore.Annotations;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
{
diff --git a/src/API/Grand.Api/Controllers/TokenController.cs b/src/API/Grand.Api/Controllers/TokenController.cs
index 98e8300af..cf391c696 100644
--- a/src/API/Grand.Api/Controllers/TokenController.cs
+++ b/src/API/Grand.Api/Controllers/TokenController.cs
@@ -5,8 +5,6 @@ using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers
{
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/API/Grand.Api/Controllers/TokenWebController.cs
index 725e71cf2..246929582 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/API/Grand.Api/Controllers/TokenWebController.cs
@@ -11,11 +11,7 @@ using MediatR;
using Microsoft.AspNetCore.Antiforgery;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Grand.Api.Controllers
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs
index ca9c7ab2d..8a0c5f5b4 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductAttributeDto.cs
@@ -1,5 +1,4 @@
using Grand.Api.Models;
-using System.Collections.Generic;
namespace Grand.Api.DTOs.Catalog
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
index 80131c1d9..f9c60ff1c 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductAttributeMappingDto.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Api.Models;
-using System.Collections.Generic;
namespace Grand.Api.DTOs.Catalog
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs
index 3a10eb4ee..c74bf496e 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductDto.cs
@@ -1,7 +1,5 @@
using Grand.Api.Models;
using Grand.Domain.Catalog;
-using System;
-using System.Collections.Generic;
namespace Grand.Api.DTOs.Catalog
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs
index 245c0bd6c..6de10ce70 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductTierPriceDto.cs
@@ -1,5 +1,4 @@
using Grand.Api.Models;
-using System;
namespace Grand.Api.DTOs.Catalog
{
diff --git a/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs b/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs
index 0b0a17ce2..b190d4abb 100644
--- a/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/SpecificationAttributeDto.cs
@@ -1,5 +1,4 @@
using Grand.Api.Models;
-using System.Collections.Generic;
namespace Grand.Api.DTOs.Catalog
{
diff --git a/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs b/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs
index dc10b8a96..b7aa89e45 100644
--- a/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs
+++ b/src/API/Grand.Api/DTOs/Common/CurrencyDto.cs
@@ -1,5 +1,4 @@
using Grand.Api.Models;
-using System;
namespace Grand.Api.DTOs.Common
{
diff --git a/src/API/Grand.Api/DTOs/Customers/AddressDto.cs b/src/API/Grand.Api/DTOs/Customers/AddressDto.cs
index 2fc6480a6..c16f5acb8 100644
--- a/src/API/Grand.Api/DTOs/Customers/AddressDto.cs
+++ b/src/API/Grand.Api/DTOs/Customers/AddressDto.cs
@@ -1,5 +1,4 @@
using Grand.Api.Models;
-using System;
namespace Grand.Api.DTOs.Customers
{
diff --git a/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs b/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs
index c6666815d..490b3be52 100644
--- a/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs
+++ b/src/API/Grand.Api/DTOs/Customers/CustomerDto.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
namespace Grand.Api.DTOs.Customers
{
diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
index ab8e42622..8c9c65e14 100644
--- a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
+++ b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Security;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Api.Filters
{
diff --git a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
index 65592ea1a..16a38d2d9 100644
--- a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
+++ b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
@@ -7,8 +7,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Threading.Tasks;
namespace Grand.Api.Infrastructure
{
diff --git a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs b/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
index 1fe1473ff..3fc65b6d6 100644
--- a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
+++ b/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
@@ -6,8 +6,6 @@ using Grand.Api.Infrastructure.DependencyManagement;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Configuration;
using Microsoft.OData.ModelBuilder;
-using System;
-using System.Collections.Generic;
namespace Grand.Api.Infrastructure
{
diff --git a/src/API/Grand.Api/Infrastructure/EnumSchemaFilter.cs b/src/API/Grand.Api/Infrastructure/EnumSchemaFilter.cs
index 19a708258..ee0e763c9 100644
--- a/src/API/Grand.Api/Infrastructure/EnumSchemaFilter.cs
+++ b/src/API/Grand.Api/Infrastructure/EnumSchemaFilter.cs
@@ -1,8 +1,6 @@
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
-using System;
-using System.Linq;
namespace Grand.Api.Infrastructure
{
diff --git a/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs b/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs
index 206109f7d..7eb80cf49 100644
--- a/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs
+++ b/src/API/Grand.Api/Infrastructure/Extensions/JwtSecurityKey.cs
@@ -1,5 +1,4 @@
using Microsoft.IdentityModel.Tokens;
-using System.Text;
namespace Grand.Api.Infrastructure.Extensions
{
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs b/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
index 2175347ad..fea158616 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
+++ b/src/API/Grand.Api/Infrastructure/Mapper/Profiles/CustomerProfile.cs
@@ -3,8 +3,6 @@ using Grand.Api.DTOs.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure.Mapper;
-using System;
-using System.Linq;
namespace Grand.Api.Infrastructure.Mapper
{
diff --git a/src/API/Grand.Api/Infrastructure/ODataStartup.cs b/src/API/Grand.Api/Infrastructure/ODataStartup.cs
index 2764ed512..6fe4d53cd 100644
--- a/src/API/Grand.Api/Infrastructure/ODataStartup.cs
+++ b/src/API/Grand.Api/Infrastructure/ODataStartup.cs
@@ -10,8 +10,6 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OData.Edm;
using Microsoft.OData.ModelBuilder;
-using System;
-using System.Linq;
namespace Grand.Api.Infrastructure
{
diff --git a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs b/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs
index 4415a9db1..3487d778b 100644
--- a/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs
+++ b/src/API/Grand.Api/Infrastructure/SwaggerStartup.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.OData;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models;
-using System.Collections.Generic;
namespace Grand.Api.Infrastructure
{
diff --git a/src/API/Grand.Api/Jwt/JwtToken.cs b/src/API/Grand.Api/Jwt/JwtToken.cs
index 6ed268ba7..1320a9414 100644
--- a/src/API/Grand.Api/Jwt/JwtToken.cs
+++ b/src/API/Grand.Api/Jwt/JwtToken.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IdentityModel.Tokens.Jwt;
+using System.IdentityModel.Tokens.Jwt;
namespace Grand.Api.Jwt
{
diff --git a/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs b/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs
index f1a30dc90..857bc5178 100644
--- a/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs
+++ b/src/API/Grand.Api/Jwt/JwtTokenBuilder.cs
@@ -1,8 +1,5 @@
using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
using System.Security.Claims;
namespace Grand.Api.Jwt
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetBrandQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetBrandQueryHandler.cs
index ae1403640..d14f2c6dd 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetBrandQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetBrandQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetCategoryQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetCategoryQueryHandler.cs
index 841aa48b2..f8bb9226d 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetCategoryQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetCategoryQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetCollectionQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetCollectionQueryHandler.cs
index 84e3fa513..30bddee4a 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetCollectionQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetCollectionQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductAttributeQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductAttributeQueryHandler.cs
index 7f13b9013..58b3a88f9 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductAttributeQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductAttributeQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductQueryHandler.cs
index 5f8980c39..e2287bf37 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetProductQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Catalog/GetSpecificationAttributeQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Catalog/GetSpecificationAttributeQueryHandler.cs
index c787ac028..f93ce7e8d 100644
--- a/src/API/Grand.Api/Queries/Handlers/Catalog/GetSpecificationAttributeQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Catalog/GetSpecificationAttributeQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetCountryQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetCountryQueryHandler.cs
index b8237e19d..c375aa4b5 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetCountryQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetCountryQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetCurrencyQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetCurrencyQueryHandler.cs
index b5a2729e9..6085d6c93 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetCurrencyQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetCurrencyQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetLanguageQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetLanguageQueryHandler.cs
index a7dc1119f..110d68fea 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetLanguageQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetLanguageQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs
index 1b4b4ff0e..af82926eb 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetLayoutQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetPictureByIdQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetPictureByIdQueryHandler.cs
index a7828f628..8765ea708 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetPictureByIdQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetPictureByIdQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetStateProvinceQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetStateProvinceQueryHandler.cs
index f73a3680a..ed8f22ffa 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetStateProvinceQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetStateProvinceQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Common/GetStoreQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Common/GetStoreQueryHandler.cs
index c2986d6ce..becb2e8eb 100644
--- a/src/API/Grand.Api/Queries/Handlers/Common/GetStoreQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Common/GetStoreQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Common
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerGroupQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerGroupQueryHandler.cs
index 9d21cde69..03b677b30 100644
--- a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerGroupQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerGroupQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
index 24fc78e5f..109c32351 100644
--- a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
@@ -3,8 +3,6 @@ using Grand.Api.Extensions;
using Grand.Api.Queries.Models.Customers;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Customers/GetVendorQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Customers/GetVendorQueryHandler.cs
index 1ffc4776b..9bf4ef488 100644
--- a/src/API/Grand.Api/Queries/Handlers/Customers/GetVendorQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Customers/GetVendorQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Customers
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Shipping/GetDeliveryDateQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Shipping/GetDeliveryDateQueryHandler.cs
index 586b03639..26025def3 100644
--- a/src/API/Grand.Api/Queries/Handlers/Shipping/GetDeliveryDateQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Shipping/GetDeliveryDateQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Shipping
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Shipping/GetPickupPointQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Shipping/GetPickupPointQueryHandler.cs
index afe882775..07bedecf2 100644
--- a/src/API/Grand.Api/Queries/Handlers/Shipping/GetPickupPointQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Shipping/GetPickupPointQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Shipping
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Shipping/GetShippingMethodQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Shipping/GetShippingMethodQueryHandler.cs
index bbf1b5974..3862e1740 100644
--- a/src/API/Grand.Api/Queries/Handlers/Shipping/GetShippingMethodQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Shipping/GetShippingMethodQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Shipping
{
diff --git a/src/API/Grand.Api/Queries/Handlers/Shipping/GetWarehouseQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Shipping/GetWarehouseQueryHandler.cs
index a58f945c4..7e7cf4d3b 100644
--- a/src/API/Grand.Api/Queries/Handlers/Shipping/GetWarehouseQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Shipping/GetWarehouseQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Api.Queries.Models.Common;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Api.Queries.Handlers.Shipping
{
diff --git a/src/API/Grand.Api/Queries/Models/Common/GetLayoutQuery.cs b/src/API/Grand.Api/Queries/Models/Common/GetLayoutQuery.cs
index abce00b9d..eed19d499 100644
--- a/src/API/Grand.Api/Queries/Models/Common/GetLayoutQuery.cs
+++ b/src/API/Grand.Api/Queries/Models/Common/GetLayoutQuery.cs
@@ -1,6 +1,5 @@
using Grand.Api.DTOs.Common;
using MediatR;
-using System.Linq;
namespace Grand.Api.Queries.Models.Common
{
diff --git a/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs b/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs
index da14b3784..f334cae10 100644
--- a/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs
+++ b/src/API/Grand.Api/Queries/Models/Common/GetQuery.cs
@@ -1,5 +1,4 @@
using MediatR;
-using System.Linq;
namespace Grand.Api.Queries.Models.Common
{
diff --git a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs b/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
index 5c2042219..9f4698dbe 100644
--- a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Catalog.Interfaces.Brands;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs b/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
index ab6e9a67e..babc6580b 100644
--- a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs b/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
index 79e342786..0bb79f2b0 100644
--- a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
index 43d37b9fd..ed944cd3f 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
index 7165e3ccc..d169fb29a 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
index 637ac45d7..4aa37fc7f 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
index 34744b42d..ef7799e1f 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
index 8b7f4348e..e3dada732 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
index beeb7b832..f43d1f681 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
index c5d49eba3..7f472bde8 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Stores;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
index 2318894b1..aa1d2c831 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
@@ -7,7 +7,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
index 576109b7f..a9dabb843 100644
--- a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Catalog;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Catalog
{
diff --git a/src/API/Grand.Api/Validators/Common/LoginValidator.cs b/src/API/Grand.Api/Validators/Common/LoginValidator.cs
index a3289bf4e..edea368b8 100644
--- a/src/API/Grand.Api/Validators/Common/LoginValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/LoginValidator.cs
@@ -5,7 +5,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Common
{
diff --git a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs b/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
index 00ed02662..b5fd8cbcd 100644
--- a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Common
{
diff --git a/src/API/Grand.Api/Validators/Common/PictureValidator.cs b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
index 78dc408a5..77759dd53 100644
--- a/src/API/Grand.Api/Validators/Common/PictureValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
@@ -2,7 +2,6 @@
using Grand.Api.DTOs.Common;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Common
{
diff --git a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs b/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
index 262689c8a..19f512e2d 100644
--- a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
@@ -4,9 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Api.Validators.Customers
{
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs b/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
index 6b03e4e87..3d4445b38 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
@@ -3,8 +3,6 @@ using Grand.Api.DTOs.Customers;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Customers
{
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs b/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
index 2786030c8..6f6651aa9 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
@@ -6,8 +6,6 @@ using Grand.Business.Common.Interfaces.Stores;
using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Api.Validators.Customers
{
diff --git a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs b/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
index 6eb1754dd..5687c899e 100644
--- a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
@@ -3,7 +3,6 @@ using Grand.Api.DTOs.Customers;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
namespace Grand.Api.Validators.Customers
{
diff --git a/src/Build/Grand.Common.props b/src/Build/Grand.Common.props
index caada3c0b..1f95ed3aa 100644
--- a/src/Build/Grand.Common.props
+++ b/src/Build/Grand.Common.props
@@ -13,5 +13,14 @@
<RepositoryUrl>https://github.com/grandnode/grandnode2</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
</PropertyGroup>
-
+
+ <ItemGroup>
+ <Using Include="System"/>
+ <Using Include="System.Collections.Generic"/>
+ <Using Include="System.IO"/>
+ <Using Include="System.Text"/>
+ <Using Include="System.Linq"/>
+ <Using Include="System.Threading"/>
+ <Using Include="System.Threading.Tasks"/>
+ </ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
index edc3d57cd..013c949d3 100644
--- a/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Authentication/Events/CustomerDeletedEventHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Events
{
diff --git a/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs b/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs
index 0d771f381..1569266ee 100644
--- a/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs
+++ b/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs
@@ -1,6 +1,5 @@
using Grand.Business.Authentication.Interfaces;
using Grand.Domain.Customers;
-using System;
namespace Grand.Business.Authentication.Extensions
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs
index df7144600..2a97b473e 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Customers;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs b/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs
index 3b7f9490b..50b51256d 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs
index d5d4fce58..0bdb05971 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs
@@ -2,8 +2,6 @@ using Grand.Business.Authentication.Utilities;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs
index fb7369dbf..a3411cb81 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs
index 3afca6cf0..8848694c4 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
index a9529cc4d..f28e26f92 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
@@ -1,5 +1,4 @@
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 4208dd3a5..bbe907d21 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Security;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs
index 52677d373..bf1abe7ae 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Authentication.Utilities;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs
index d7d571ba6..45d6e85a4 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Authentication.Utilities;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Interfaces
{
diff --git a/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
index 7591f7425..7f3aeaa99 100644
--- a/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
@@ -7,9 +7,6 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
index 1c428cfb2..21102778b 100644
--- a/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
@@ -9,10 +9,7 @@ using Grand.Domain.Customers;
using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
index bc3329c27..2a0aeb0fb 100644
--- a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
@@ -15,10 +15,6 @@ using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
index 3cb81a2fc..00093248a 100644
--- a/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
@@ -1,8 +1,6 @@
using Grand.Business.Authentication.Interfaces;
using Grand.Business.Customers.Interfaces;
using Microsoft.AspNetCore.Authentication.JwtBearer;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
index 2f135405b..23ed4bdd2 100644
--- a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
@@ -5,9 +5,6 @@ using Grand.Business.Common.Services.Security;
using Grand.Business.Customers.Interfaces;
using Grand.Domain.Customers;
using Microsoft.AspNetCore.Authentication.JwtBearer;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs b/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
index 55fdccfdf..bbdd97e5a 100644
--- a/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
@@ -4,12 +4,9 @@ using Grand.Domain.Customers;
using Grand.Domain.Security;
using Grand.Infrastructure.Configuration;
using Microsoft.IdentityModel.Tokens;
-using System;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
index 0ce302d38..46bc73426 100644
--- a/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
@@ -7,8 +7,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
-using System;
-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 a80ab1c00..0c1d7f1fd 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.Collections.Generic;
using System.Security.Claims;
namespace Grand.Business.Authentication.Utilities
diff --git a/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs b/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs
index fd242e095..1d3a4f411 100644
--- a/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs
+++ b/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.Authentication.Utilities
+namespace Grand.Business.Authentication.Utilities
{
public partial class TwoFactorCodeSetup
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs
index a5bcb313f..49508e635 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs
index 6b1d892f8..32ea2bc02 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs b/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs
index bb48cd2a9..d69eb7f77 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Commands.Models
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
index d1cad208f..e52f7aa32 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/BrandDeletedEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
index 67ba8bef6..f4c404717 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CategoryDeletedEventHandler.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
index 1e191e61c..d68d49213 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/CollectionDeletedEventHandler.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
index f4fd3306b..b9b291c7c 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeleteMeasureUnitOnProductEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Data;
using Grand.Domain.Directory;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
index c80577fcf..8b971a06d 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DeliveryDateDeletedEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
index f670a2040..42e081a2c 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/DiscountDeletedEventHandler.cs
@@ -6,8 +6,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
index 039585cd1..3be3be15e 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
@@ -5,11 +5,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Seo;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Newtonsoft.Json;
-using System;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
index ffa06766c..6a4ad2153 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
index 4e7b65ab9..b314e09df 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
index 613bf10ba..8478b1777 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/TaxCategoryDeletedEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Tax;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
index c36e1bf44..78bec0596 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
index 45a371420..17f77231d 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/WarehouseDeletedEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Events.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs b/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs
index f6234549b..9d54c0bdb 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs
+++ b/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs
@@ -4,10 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Extensions
{
diff --git a/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs b/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs
index 8cd87062b..b4f505b1e 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs
+++ b/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Directory;
-using System;
namespace Grand.Business.Catalog.Extensions
{
diff --git a/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs b/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs
index 6f6f08113..8e6e7178d 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs
+++ b/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs
@@ -1,8 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Catalog.Extensions
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs
index 8c443d552..5ea0cf9fb 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Brands
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
index 3bd57ca5c..98dcab1ed 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Brands
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs
index 6ed4ff2f2..67cc97346 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Categories
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs
index 817015ff2..6c4e470cb 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Categories
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs
index 8ee22a1ca..88ef165db 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Catalog.Utilities;
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Categories
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs
index b747e723f..a09b1fe89 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
index 9fbf7ab16..b4d94f9a3 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs
index 7cefe0786..9996f56d9 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Catalog.Utilities;
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs
index 290b0bf2f..d0a2fde09 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Discounts;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Discounts
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs
index b1a944113..4a611ff08 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Interfaces.Discounts
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs
index 4ec644b20..0140fecd4 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs
@@ -1,5 +1,4 @@
using Grand.Business.Catalog.Utilities;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Discounts
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs
index 2d339aa8e..7a75a4139 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Discounts;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Discounts
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs b/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs
index 47626913a..7fa95df3b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Prices
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs
index d004f8e3e..d0f7b5f1d 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Prices
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs
index 5bbe84920..2da4a83ff 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs
index 61fd81217..ec0d25ff6 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Catalog;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs
index 26c829435..09d1f540c 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs
index dac7f5edf..ab7f0b59c 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs
index 1dc7bae9b..b36b04351 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs
@@ -1,8 +1,6 @@
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs
index aa0cbcfd2..c1e174525 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs
index 43246dcdb..4d1d290f0 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs
index cd25aea96..fc6565be6 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs
index 968a60d1c..6a599c066 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Courses;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs
index 7969a5c3f..c7a838873 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs
index 09b152db5..ee09bd00d 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs
index 0a1df7c11..ef9d580db 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs
index 65b9492e1..2892f22a0 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs
@@ -2,8 +2,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs
index 927690ed2..9c0f4a83a 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs
index bf7e8cd5d..7ba76f0c6 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs
index d429a4146..62d145496 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs
index 81aa21031..f93f1da9f 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Interfaces.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs
index 992a1b7e8..eacf764bc 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Tax;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs
index b1f61b649..7a71f8f10 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs
@@ -1,6 +1,5 @@
using Grand.Business.Catalog.Utilities;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs
index 1ed240527..3c9a13781 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs b/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs
index a269bf625..d95ba3b50 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs
+++ b/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs
@@ -1,7 +1,5 @@
using Grand.Business.Catalog.Utilities;
using Grand.Domain.Tax;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Interfaces.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
index 36ee53d8c..320384b70 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
index 3c69a7253..502ba1f6c 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
@@ -4,9 +4,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
index f0415346c..6489c9d06 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
index e07ce5d84..82213cc03 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
index e3cde22ec..2b6dd417c 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
@@ -5,11 +5,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
index ca3cc0a08..767d5ab3c 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
index f5b7d1b1d..9db797bb6 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Vendors;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs b/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs
index 57487922f..5183dbb66 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Queries.Models
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs b/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs
index 51f42c51d..73b67cfee 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Queries.Models
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs b/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs
index 72e5224ec..d5490a9e8 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs b/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs
index 6d60757c5..88dfa006b 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Catalog.Queries.Models
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
index 151d46692..4a1639403 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Brands
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
index 56e08e58c..b942c98a7 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
@@ -9,10 +9,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Brands
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
index 79ab20e7f..f69d712d6 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
index 0709bf1fb..fc7632516 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
@@ -11,10 +11,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Categories
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
index 0785e4fdf..9f4766761 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
@@ -10,10 +10,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Categories
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
index c66792be5..e5e3f1d03 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
index 32e99a995..1603761f4 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
@@ -10,10 +10,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
index c4ad4890a..917cdde08 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
@@ -10,9 +10,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Collections
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
index 9563a1d59..01f4393ef 100644
--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
@@ -14,10 +14,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Discounts
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
index a0b45c58f..32425d5d2 100644
--- a/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
@@ -7,9 +7,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Tax;
using Grand.Infrastructure;
using Grand.SharedKernel;
-using System;
using System.Globalization;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Prices
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
index 1027fd173..846f95272 100644
--- a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
@@ -15,10 +15,6 @@ using Grand.Domain.Directory;
using Grand.Domain.Discounts;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Brands;
namespace Grand.Business.Catalog.Services.Prices
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
index 64dd4a6a7..ff4ab69d4 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
@@ -10,10 +10,6 @@ using Grand.Domain.Data;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
index e93bac55b..ab87a7ffe 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
@@ -6,9 +6,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
index fa524fd66..479f52147 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
index 8a6dbba94..b7c69744d 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
@@ -9,10 +9,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
index be4bccc18..6e570ae89 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
index bca90bd0a..eeb6347e3 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
@@ -10,12 +10,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
using Grand.Business.Storage.Interfaces;
namespace Grand.Business.Catalog.Services.Products
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
index e5b1ab009..069fc1a65 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
@@ -3,9 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
index 4f1ecd83c..11ce94f85 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
@@ -6,10 +6,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
index 4269016a3..e2b0bde40 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Courses;
using Grand.Domain.Data;
-using System;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
index b4652ac9e..ce410f7ca 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
index 3b3df58ac..bad619291 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
@@ -4,10 +4,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
index a5bef580d..4e45aea40 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
@@ -4,9 +4,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
index 0b8eb3ba6..397d21ffa 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
@@ -13,10 +13,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
index a4912ab14..d36352da8 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
index 9c2d7d577..5be5db1e7 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
index 6e7a19eca..1dc736016 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
@@ -6,9 +6,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs b/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
index 9f5e73a1f..dd8a9bc1b 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
@@ -2,9 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
index 55315b3fb..21ea729bd 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Tax;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
index 813353350..078bb90ec 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
@@ -11,10 +11,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Tax;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
index 66d11492e..97f6d6bfe 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
@@ -1,9 +1,7 @@
using Grand.Business.Catalog.Interfaces.Tax;
using Grand.Business.Catalog.Utilities;
using Grand.Domain.Tax;
-using System;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Services.Tax
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs b/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs
index 78c3f8d0f..4ea562fd0 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs
+++ b/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace Grand.Business.Catalog.Utilities
{
/// <summary>
diff --git a/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs b/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs
index e0f727617..edc4ce6bc 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs
+++ b/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Catalog.Utilities
{
public class VatResponse
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
index 935d687c0..0ac97cd45 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
@@ -4,10 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Messages.Interfaces;
using Grand.Domain.Catalog;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
index e154e1c50..2eac9de62 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
@@ -6,10 +6,6 @@ using Grand.Business.Checkout.Services.Orders;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
index 511c319f3..f05e6fa39 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
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 481817865..7b88bc767 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Commands.Models.Orders;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
index 21b14109c..7530f8561 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
@@ -6,11 +6,7 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Business.Checkout.Events.Orders;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Checkout.Interfaces.Payments;
-using System.Linq;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
index 116d15b12..1151fcf66 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
@@ -6,10 +6,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
index 8f2f52d46..8c4dc3117 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
@@ -9,10 +9,6 @@ using Grand.Domain.Logging;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
index 433ca99aa..cc42bf782 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
index 663dba14d..0b512c719 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
@@ -6,10 +6,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
index f0de92105..d025b52db 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
@@ -7,10 +7,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
index 4ba4d8424..659ccb2c2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
index e9c26d8c5..f55f8a002 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Checkout.Interfaces.Payments;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
index a95d2e5ee..e8af1153e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
@@ -6,9 +6,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
index a49a3b54a..e1a7ef277 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
@@ -2,10 +2,6 @@
using Grand.Domain.Orders;
using Grand.Business.Checkout.Commands.Models.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
index a4610873c..fc32daa7b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
@@ -5,10 +5,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Business.Messages.Interfaces;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
index 6dee01438..23e1016a6 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
index e461a83a1..595f32a0c 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
@@ -10,10 +10,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Logging;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
index 9644e68e0..efd9835c9 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
index 04a96b75a..1baf3c3dd 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
@@ -35,12 +35,6 @@ using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
index 42006b1ea..a0bca1744 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
@@ -1,10 +1,6 @@
using Grand.Domain.Orders;
using Grand.Business.Checkout.Commands.Models.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
index 7ae8ba5ae..e063bb073 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
@@ -7,11 +7,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
index 7aea6b88f..f72c3b1ad 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
index ec5e7a8fd..8dcc94df4 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Customers.Interfaces;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
index bd7f9613f..7c77aa865 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
@@ -8,10 +8,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Localization;
using Grand.Domain.Logging;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
index e2779e076..045df23b2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
index 033d499bf..3a154123a 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Common.Interfaces.Localization;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
index 5a7507209..4c549187a 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
@@ -6,10 +6,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
index 753a3b53e..a1d346ab4 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
@@ -2,11 +2,6 @@
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
index bb24ee457..0006f6dfe 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
@@ -3,10 +3,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
index 0c86f0751..a51c02653 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
@@ -8,10 +8,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Domain.Logging;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
index af3cb066f..0faf227a0 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
@@ -6,9 +6,6 @@ using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
index c5bf2cfef..b06232d7e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
@@ -7,10 +7,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
index 103b42845..3094cba1b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
@@ -7,10 +7,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs
index 5c83a7923..92fad3d52 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Payments;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs
index 0feec8ece..ecf7b3c32 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Payments;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs
index cb1f7d5b5..7a169bdf3 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs
index b48c5b756..2c0516843 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Payments;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
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 b32482d9b..cfa65c660 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs
index 67cd8ecb0..fe8bd168e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs
index f772bea80..223cbc12a 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Payments;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Commands.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs b/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs
index 3e09e8537..78ca83b74 100644
--- a/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs
+++ b/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs
@@ -1,4 +1,3 @@
-using System;
namespace Grand.Business.Checkout.Enum
{
/// <summary>
diff --git a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
index 0cf818dda..52503ba51 100644
--- a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Customers.Events;
using Grand.Domain.Orders;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Customers
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
index 1d6a901f5..90d5bb1f8 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
index 6aea44d4b..507aa8e74 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
index c8fd65d2f..956ffac80 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
index 57e70f5de..66144e5b6 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
index 38f706371..9e103383e 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
index 0259d4188..834b76c0e 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
index 36bda7b46..8bc1d61c6 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Customers.Events;
using Grand.Infrastructure;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Events.ShoppingCart
{
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs
index c6f2b6214..df31d5805 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Events.ShoppingCart
{
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs
index 1b1dd4959..b68dc1b93 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Events.ShoppingCart
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs
index 6adb24b23..0f516cc43 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs
@@ -1,8 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
index c1b97ef93..b7a7bc989 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
@@ -2,7 +2,6 @@
using Grand.Business.Checkout.Utilities;
using Grand.Domain.Payments;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs
index 71fc2d451..fc1f1cde5 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using System;
-using System.Linq;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs
index dea25b48b..06d5279cf 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs
@@ -2,9 +2,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Checkout.Interfaces.Payments;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
index a66151eee..61bc16e2b 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Business.Checkout.Events.Shipping;
using Grand.Domain.Shipping;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs
index 8a4b83be3..0620fd157 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs
@@ -1,8 +1,5 @@
using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
index b8c7dbdd1..060d7805b 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs
index ebab3304f..6dc6e8c31 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Extensions
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs
index 7c561d7cf..eb63b840f 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs
index fb6bfa542..54c9cd87f 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs
index 9d4a32be3..f73697088 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs
index 954863075..e19babefe 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.GiftVouchers
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
index 5d5c41c99..6f61ff155 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs
index 79f33be05..ee8527ae0 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs
index c9496cebf..57aec4a06 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Utilities;
using Grand.Business.Checkout.Utilities;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs
index ff4ac090a..a694a9322 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs
@@ -2,9 +2,6 @@ using Grand.Domain;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs
index 258fbb92b..9bdda7abf 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs
index 72596da54..1b5142bc0 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
index d7719017c..abe9c76d6 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
@@ -2,9 +2,6 @@ using Grand.Business.Checkout.Services.Orders;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs
index 60318b238..d9b0c8598 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs
@@ -3,9 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs
index fdfc30802..9e7cb840b 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs
@@ -3,8 +3,6 @@ using Grand.Business.Checkout.Utilities;
using Grand.Infrastructure.Plugins;
using Grand.Domain.Orders;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Threading.Tasks;
using Grand.Domain.Payments;
namespace Grand.Business.Checkout.Interfaces.Payments
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs
index 92f1395b7..bf8d5f8e7 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs
@@ -3,8 +3,6 @@ using Grand.Business.Checkout.Utilities;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Payments
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs
index e3177e541..e284221c3 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Payments;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Payments
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs
index 6b4ee8163..cf16ba1c8 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs
index efa6bfeb5..a689a7110 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
index 1b2e17dea..a45242587 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs
index fed0befc3..307597844 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs
@@ -1,6 +1,4 @@
using Grand.Business.Checkout.Enum;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs
index 77b8d8be0..234b59587 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Customers;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs
index a284b1a0c..8eb16582d 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs
@@ -3,8 +3,6 @@ using Grand.Business.Checkout.Utilities;
using Grand.Infrastructure.Plugins;
using Grand.Domain.Orders;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs
index d722d2dff..5fbae20fe 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs
index 700e5f140..df3a6ee87 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs
+++ b/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Interfaces.Shipping
{
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 bcf013c82..901aca695 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
index fc1f62403..ab1400f1a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
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 830afd641..88d250032 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
index 40f697edf..71c546e5a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
index ad2adf737..7737a0beb 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
index c4de6f357..dc180afb3 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
index 35ec9a061..8dc48baa6 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
index d5eec5a7f..fb545f59f 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
index 6d34123b9..1b9d1650b 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
index d43f74262..f9599bed3 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
index 0fba6ef89..41e6a0be7 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
index f1f84b6ab..8ccc6a9c1 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
index c6e5643b6..a75fe0325 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
index f804a2a9d..476beae2a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
index 4b0ca14ec..d1c023b47 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
@@ -2,10 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
index 08f915380..211f02317 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Payments;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
index 1a62b63cd..774a175d0 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Shipping;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
index 7ff65096a..5e18c390e 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
@@ -3,10 +3,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Domain.Orders;
using Grand.Domain.Vendors;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
index 3956447fe..9e35140d3 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
@@ -3,10 +3,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Business.Checkout.Queries.Models.Orders;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Queries.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs
index 3b1bb3372..0318b884e 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs
index fbb4fc1d1..b59a39d89 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs
index 94569c9f7..fe1040d30 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Linq;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs
index 647ed3184..dfc8fc630 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Payments;
using MediatR;
-using System;
-using System.Linq;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs
index 12167cafe..1e264a53b 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Orders;
using Grand.Domain.Vendors;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Queries.Models.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
index c9ab921c5..852045260 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
@@ -10,12 +10,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
index 59a73bd50..a9544758e 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
@@ -2,10 +2,6 @@ using Grand.Business.Checkout.Extensions;
using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
using Grand.Domain.Common;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
index f63386b66..8a493a5bd 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
@@ -8,10 +8,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.CheckoutAttributes
{
diff --git a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
index 56fdd1e98..af9af2042 100644
--- a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
@@ -5,10 +5,6 @@ using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.GiftVouchers
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
index 5f855ef6f..01c21274d 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
@@ -3,10 +3,6 @@ using Grand.Domain.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
index 909bd8333..05e0b6052 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
index 52a88d9d9..f319b26d1 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
@@ -23,10 +23,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Infrastructure;
using Grand.SharedKernel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
index 41e126423..72d80062f 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
@@ -8,10 +8,6 @@ using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
index b06a6c5e1..8557461ee 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
index 629bdf76a..e4506b7e2 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
index af6cff727..674afd6db 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
@@ -15,10 +15,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
index 417d41ed9..626bdb07b 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
@@ -17,10 +17,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Orders
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
index 4766c86de..0ff7495a5 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
@@ -9,10 +9,6 @@ using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Payments
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
index f16fd9249..b82081b24 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
@@ -5,10 +5,6 @@ using Grand.Domain.Data;
using Grand.Domain.Payments;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Payments
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
index 4d084fa90..6303c1e04 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
index cb75d47a0..1491b877c 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
@@ -1,9 +1,6 @@
using Grand.Business.Checkout.Enum;
using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Infrastructure.TypeSearchers;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
index 093a676e4..c70bbf2e6 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
index 23331d1f2..06eb36f55 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
@@ -4,10 +4,6 @@ using Grand.Domain.Data;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
index 7ff8ad79b..008a50ee3 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
index ce1378a44..7af13668f 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
@@ -11,10 +11,6 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
index c26e1eae3..5159bbadc 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Services.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs b/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs
index e123a2719..1ca0162f9 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Payments;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs b/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
index 7378d87cc..5827f3743 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 System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs b/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs
index c89bccf23..27943d9e6 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Shipping;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs b/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs
index 3b8848595..950446ced 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs
@@ -7,7 +7,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Tax;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs b/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs
index 4da89e3cf..7383c3230 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs b/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs
index ca4fe3722..4030aa242 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Payments;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs b/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs
index da7628661..0a4eb14da 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Payments;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs b/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs
index d51ecc35d..931601061 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs
+++ b/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Payments;
-using System.Collections.Generic;
namespace Grand.Business.Checkout.Utilities
{
diff --git a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
index a0a29f276..65a051e21 100644
--- a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
@@ -2,8 +2,6 @@ using Grand.Business.Common.Interfaces.Seo;
using Grand.Infrastructure.Events;
using Grand.Domain.Blogs;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces.Events
{
diff --git a/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs b/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs
index 40712a3f5..f9bfcd35c 100644
--- a/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs
+++ b/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs
@@ -1,7 +1,4 @@
using Grand.Domain.Blogs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Cms.Extensions
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs b/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs
index ee62864db..caacbf4de 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Blogs;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs b/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs
index 2a97e5994..21428808d 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.News;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs b/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs
index 6ca76391a..261b5495e 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Pages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs b/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs
index 62446894b..da2eb4754 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Pages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs b/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs
index cdbcc1a57..5772ea44e 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs b/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs
index af75fa3fd..00f6342fc 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs
+++ b/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Interfaces
{
diff --git a/src/Business/Grand.Business.Cms/Services/BlogService.cs b/src/Business/Grand.Business.Cms/Services/BlogService.cs
index 8349436df..c0684a8de 100644
--- a/src/Business/Grand.Business.Cms/Services/BlogService.cs
+++ b/src/Business/Grand.Business.Cms/Services/BlogService.cs
@@ -5,10 +5,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Services
{
diff --git a/src/Business/Grand.Business.Cms/Services/NewsService.cs b/src/Business/Grand.Business.Cms/Services/NewsService.cs
index 09c378a73..73f339b08 100644
--- a/src/Business/Grand.Business.Cms/Services/NewsService.cs
+++ b/src/Business/Grand.Business.Cms/Services/NewsService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Services
{
diff --git a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
index 4838b82be..817362cb6 100644
--- a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Services
{
diff --git a/src/Business/Grand.Business.Cms/Services/PageService.cs b/src/Business/Grand.Business.Cms/Services/PageService.cs
index 60c46cdf5..6ab1ec22b 100644
--- a/src/Business/Grand.Business.Cms/Services/PageService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageService.cs
@@ -9,10 +9,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Services
{
diff --git a/src/Business/Grand.Business.Cms/Services/WidgetService.cs b/src/Business/Grand.Business.Cms/Services/WidgetService.cs
index e8467666e..a207f01b1 100644
--- a/src/Business/Grand.Business.Cms/Services/WidgetService.cs
+++ b/src/Business/Grand.Business.Cms/Services/WidgetService.cs
@@ -2,10 +2,6 @@ using Grand.Business.Cms.Interfaces;
using Grand.Domain.Cms;
using Grand.Domain.Customers;
using Grand.Infrastructure.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Services
{
diff --git a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
index 99ea26414..66753b057 100644
--- a/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Common/Events/GroupDeletedEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Events
{
diff --git a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
index 8d44cc740..5c5815bbd 100644
--- a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Events;
using Grand.Domain.Localization;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Events
{
diff --git a/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs b/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
index 055d9ad27..7387a9265 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.Collections.Generic;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs b/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs
index 8360872a2..fa2ea25d2 100644
--- a/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain;
using Grand.Domain.History;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs b/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs
index e864f8ee7..dd13c92b0 100644
--- a/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-using System;
using Grand.Business.Common.Interfaces.Logging;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs b/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs
index a7943da61..f12d88ec4 100644
--- a/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs
@@ -5,11 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs b/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs
index f69194b66..f1e361e5e 100644
--- a/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs
@@ -5,11 +5,8 @@ using Grand.Domain.Permissions;
using Grand.Infrastructure;
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs b/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs
index 5f34fa34e..9cdc047be 100644
--- a/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs
+++ b/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs
@@ -1,7 +1,5 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Extensions
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs b/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs
index 5713f3de1..3b55ad950 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Addresses
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs b/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs
index 47c19974d..525f9723e 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Addresses
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs b/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs
index 5719bb6cd..dcb8dec12 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs
@@ -1,7 +1,4 @@
using Grand.Domain.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Configuration
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IConsentCookie.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IConsentCookie.cs
index d048ad11b..948cfaa5e 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IConsentCookie.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IConsentCookie.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Common.Interfaces.Directory
{
public interface IConsentCookie
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICookiePreference.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/ICookiePreference.cs
index f4e0f288f..f34597716 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICookiePreference.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/ICookiePreference.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs
index 8f8e2c804..29cc2d121 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
index 667c1b0b0..10e65a03c 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs
index 53622b242..6e4437075 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.ObjectModel;
namespace Grand.Business.Common.Interfaces.Directory
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs
index a80d300d1..bcc64d7ee 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs
@@ -1,7 +1,5 @@
using Grand.Business.Common.Interfaces.Providers;
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IGoogleAnalyticsService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IGoogleAnalyticsService.cs
index d182f0a7b..62bb3d160 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IGoogleAnalyticsService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IGoogleAnalyticsService.cs
@@ -1,6 +1,4 @@
using Grand.Business.Common.Utilities;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs
index 8833513a3..214d97261 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs
index 700057df6..db0c30ba9 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.History;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IMeasureService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IMeasureService.cs
index a59f510fc..d60a3f01e 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IMeasureService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IMeasureService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IRobotsTxtService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IRobotsTxtService.cs
index 12718d018..40b747578 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IRobotsTxtService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IRobotsTxtService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Common;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ISearchTermService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/ISearchTermService.cs
index a3022da42..9a8ec3eb3 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ISearchTermService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/ISearchTermService.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Utilities;
using Grand.Domain;
using Grand.Domain.Common;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs b/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs
index a58d67fd7..890bd363b 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs
@@ -1,5 +1,4 @@
using Grand.Domain;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Directory
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs b/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs
index 9e299fb84..082ed345b 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Localization
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs b/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs
index 8adee42a0..8f405bb25 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Localization
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs b/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs
index dc1d48e4f..765183462 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.Common.Interfaces.Logging
+namespace Grand.Business.Common.Interfaces.Logging
{
public partial interface IActivityKeywordsProvider
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs b/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs
index 36ac11dac..85dae7318 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs
@@ -1,9 +1,6 @@
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Logging
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs b/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs
index 3f8f7334a..875610e62 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs
@@ -1,9 +1,6 @@
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Logging
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs b/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs
index d7ffaf375..9dbadefe8 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs
@@ -1,8 +1,5 @@
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Pdf
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs b/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs
index 538caa447..98663b253 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Business.Common.Interfaces.Pdf
+namespace Grand.Business.Common.Interfaces.Pdf
{
/// <summary>
/// Allow render rezor view as string
diff --git a/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs b/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs
index 074554612..4ee881044 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Directory;
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Providers
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs b/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs
index da3a6d137..7e8b598d6 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Interfaces.Security
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs b/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs
index 84371895e..464459d86 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Security
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs b/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs
index 32866a98c..595110308 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Grand.Domain.Seo;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Seo
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs b/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs
index 671b627f8..c5fda0e38 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs
+++ b/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Stores;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Interfaces.Stores
{
diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
index d26c2332f..7fa9bc200 100644
--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
@@ -5,11 +5,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Localization;
using Grand.SharedKernel.Extensions;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Addresses
{
diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
index e5afb0ebc..10adf6742 100644
--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Common;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Addresses
{
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index 2a0dbaf99..3f4f43095 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -3,11 +3,7 @@ using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Configuration
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CookiePreference.cs b/src/Business/Grand.Business.Common/Services/Directory/CookiePreference.cs
index c41527809..79dc32bbc 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CookiePreference.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CookiePreference.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
index 8cbfa14f9..c256aa3b0 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
index 69e5e18b1..3ae3ba607 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs b/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
index a68f854db..809c4ab7e 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.ObjectModel;
using System.Diagnostics;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs b/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
index a73fefd9e..d6beccdca 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
@@ -1,10 +1,6 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Providers;
using Grand.Domain.Directory;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/GeoLookupService.cs b/src/Business/Grand.Business.Common/Services/Directory/GeoLookupService.cs
index 0e462182f..b059c0487 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/GeoLookupService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/GeoLookupService.cs
@@ -7,7 +7,6 @@ using Grand.SharedKernel.Extensions;
using MaxMind.GeoIP2;
using MaxMind.GeoIP2.Exceptions;
using MaxMind.GeoIP2.Responses;
-using System;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/GoogleAnalyticsService.cs b/src/Business/Grand.Business.Common/Services/Directory/GoogleAnalyticsService.cs
index 5476aec12..f981b27ec 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/GoogleAnalyticsService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/GoogleAnalyticsService.cs
@@ -7,9 +7,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Common.Utilities;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
index be5211c92..a800f95d0 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
index e92d0addb..9c43cbede 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
@@ -2,10 +2,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.History;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/MeasureService.cs b/src/Business/Grand.Business.Common/Services/Directory/MeasureService.cs
index df62a2798..c13348c81 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/MeasureService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/MeasureService.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Data;
using Grand.Domain.Directory;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/RobotsTxtService.cs b/src/Business/Grand.Business.Common/Services/Directory/RobotsTxtService.cs
index 089b10948..3ff76362c 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/RobotsTxtService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/RobotsTxtService.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/SearchTermService.cs b/src/Business/Grand.Business.Common/Services/Directory/SearchTermService.cs
index e64212a12..775d6c4b1 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/SearchTermService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/SearchTermService.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Common;
using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
index ae8d640a0..79a0522dd 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
@@ -3,9 +3,6 @@ using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Data;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Directory
{
diff --git a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
index 99350d55b..e7630f0be 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Localization;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Localization
{
diff --git a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
index 9b6431061..758fc7315 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
@@ -6,12 +6,6 @@ using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Xml;
namespace Grand.Business.Common.Services.Localization
diff --git a/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs b/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
index 064f1a4e9..baf9c0ceb 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
@@ -1,5 +1,4 @@
using Grand.Business.Common.Interfaces.Logging;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Logging
{
diff --git a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
index 045a1e653..4b3009e70 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
@@ -6,10 +6,6 @@ using Grand.Domain.Logging;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Logging
{
diff --git a/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs b/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
index 2679763ae..d46134566 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
@@ -3,10 +3,6 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Logging
{
diff --git a/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs b/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
index 2f03f770d..6d6a37e96 100644
--- a/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
+++ b/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
@@ -7,9 +7,6 @@ using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Pdf
{
diff --git a/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs b/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
index f6c18415d..610fe7469 100644
--- a/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
+++ b/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
@@ -5,10 +5,6 @@ using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
using Wkhtmltopdf.NetCore;
namespace Grand.Business.Common.Services.Pdf
diff --git a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
index d9fd70c09..d864ceb28 100644
--- a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Security;
using Grand.Domain.Customers;
-using System;
-using System.IO;
using System.Security.Cryptography;
-using System.Text;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
index 835d29f9d..9a7d0555c 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Interfaces.Security;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
index d1376c53e..ba4718e06 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Permissions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Directory;
namespace Grand.Business.Common.Services.Security
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs
index e433ae7cb..d26086f97 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs
index 29a69aea2..9b19a9c6d 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs
index c3d86ff87..832dde658 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs
index f2e53c916..533e30885 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs
index 66ee59004..e3508de32 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs
index 614097974..335720971 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
index eff0b358c..bd80a106c 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Permissions;
-using System.Collections.Generic;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs b/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
index 15c278863..bcb228fd1 100644
--- a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
+++ b/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
@@ -5,10 +5,6 @@ using Grand.Domain.Seo;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Seo
{
diff --git a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
index 4afb996a1..32df792b3 100644
--- a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
+++ b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Stores;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Common.Services.Stores
{
diff --git a/src/Business/Grand.Business.Common/Utilities/GoogleAnalyticsResult.cs b/src/Business/Grand.Business.Common/Utilities/GoogleAnalyticsResult.cs
index 9e36489a6..916bd3cf3 100644
--- a/src/Business/Grand.Business.Common/Utilities/GoogleAnalyticsResult.cs
+++ b/src/Business/Grand.Business.Common/Utilities/GoogleAnalyticsResult.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.Common.Utilities
+namespace Grand.Business.Common.Utilities
{
public partial class GoogleAnalyticsResult
{
diff --git a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
index 0349d2b3b..be7ee4d68 100644
--- a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
+++ b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Business.Customers.Events;
using Grand.Domain.Customers;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Directory;
namespace Grand.Business.Customers.Commands.Handlers
diff --git a/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs b/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs
index aca3cd15a..55f885f3b 100644
--- a/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs
+++ b/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Vendors;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Customers.Commands.Models
{
diff --git a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs b/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
index 82f448940..37a9cbf63 100644
--- a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
+++ b/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Affiliates;
using Grand.Domain.Seo;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Extensions
{
diff --git a/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs b/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
index b5fa6859c..df0dc2a0e 100644
--- a/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
+++ b/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Business.Customers.Events;
using Grand.Business.Customers.Utilities;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Extensions
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs b/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs
index acb3c586a..a5a0af191 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Affiliates;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs
index 71cdd24ef..fa34d8d89 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs
index a607ee7af..4c0b97960 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs
index f9666ad13..cfa8cd40a 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs
index b90a0205f..81e526398 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs
@@ -1,6 +1,5 @@
using Grand.Business.Customers.Utilities;
using Grand.Domain.Customers;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs
index 735a643a5..7af37f0c1 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs b/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs
index 2836afd90..6373b37c9 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs
@@ -3,10 +3,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
using System.Linq.Expressions;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs b/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs
index feb9216f2..902559bc5 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs b/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs
index 3d4732f22..db1e6338a 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs b/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs
index e27fab1d4..75e5ca10c 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs
+++ b/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Vendors;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Interfaces
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
index de54661eb..ad5286217 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
@@ -2,11 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Linq;
using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
index 9ebd9ca03..5a78de938 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Customers.Queries.Models;
using Grand.Domain.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
index 06b8af462..1bbcfc472 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
@@ -2,10 +2,6 @@
using Grand.Business.Customers.Queries.Models;
using Grand.Domain.Customers;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Queries.Handlers
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs b/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs
index 94279beaf..e92fc31ef 100644
--- a/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
using System.Linq.Expressions;
namespace Grand.Business.Customers.Queries.Models
diff --git a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
index fcb936b08..9de125495 100644
--- a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
+++ b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Affiliates;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
index 098ceaea9..e585c57ed 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
@@ -7,11 +7,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.SharedKernel.Extensions;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
index 86bd942a5..70f214d6e 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
index 0e32c5127..87cbfbcea 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
@@ -3,10 +3,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
index 15b705810..b3e2f204a 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
@@ -9,9 +9,6 @@ using Grand.Domain.Customers;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
index ef28227ce..b12b381de 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
@@ -3,10 +3,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
index 9782a5f04..028c33508 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
@@ -11,11 +11,7 @@ using Grand.Domain.Stores;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Linq.Expressions;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
index e2d9233dd..26f928db1 100644
--- a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/UserApiService.cs b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
index facb04914..ff709e602 100644
--- a/src/Business/Grand.Business.Customers/Services/UserApiService.cs
+++ b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
@@ -4,8 +4,6 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Services/VendorService.cs b/src/Business/Grand.Business.Customers/Services/VendorService.cs
index 37ae0e05a..e94314499 100644
--- a/src/Business/Grand.Business.Customers/Services/VendorService.cs
+++ b/src/Business/Grand.Business.Customers/Services/VendorService.cs
@@ -4,10 +4,6 @@ using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Vendors;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Services
{
diff --git a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs b/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs
index 2e065fba2..31ff7ac69 100644
--- a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs
+++ b/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Customers.Utilities
{
/// <summary>
/// Change password result
diff --git a/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs b/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs
index a32904c85..0fa2045ae 100644
--- a/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs
+++ b/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Customers.Utilities
{
/// <summary>
/// Customerregistration result
diff --git a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
index 5bb087c64..3b52d6685 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
@@ -10,11 +10,6 @@ using Grand.Domain.Logging;
using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
index e372245a1..548538147 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
@@ -11,11 +11,6 @@ using Grand.Domain.Messages;
using Grand.Domain.Orders;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Directory;
namespace Grand.Business.Marketing.Commands.Handlers
diff --git a/src/Business/Grand.Business.Marketing/Commands/Handlers/UpdateCustomerReminderHistoryCommandHandler.cs b/src/Business/Grand.Business.Marketing/Commands/Handlers/UpdateCustomerReminderHistoryCommandHandler.cs
index aea669db1..015386013 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Handlers/UpdateCustomerReminderHistoryCommandHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Handlers/UpdateCustomerReminderHistoryCommandHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs b/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs
index 01019ece0..81311be82 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Marketing.Commands.Models
{
diff --git a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs b/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs
index 9df4f3c69..153f51801 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Marketing.Commands.Models
{
diff --git a/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
index 1d14278f1..7ca3a2ba1 100644
--- a/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Checkout.Events.ShoppingCart;
using Grand.Business.Marketing.Interfaces.Customers;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Events
{
diff --git a/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
index 136d0a63a..db302ce76 100644
--- a/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Domain.Customers;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Events
{
diff --git a/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
index 14c6cf024..a5f862042 100644
--- a/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Marketing.Commands.Models;
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Domain.Customers;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Events
{
diff --git a/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs b/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs
index 53261ab3d..5934486ef 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs
+++ b/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs
@@ -3,10 +3,6 @@ using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Domain.Knowledgebase;
using Grand.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Extensions
{
diff --git a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
index fad082f1c..0e38e6e3a 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Events;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Extensions
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs
index 63181e56a..36ecad116 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Banners
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs
index 00b76480e..d2199060d 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Campaigns
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs
index b021e3986..37f50acff 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs
index 4cf43427d..51c6e41a8 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs
index 127fc9e59..86e176306 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Messages;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs
index 0b9433942..a8d74f0e9 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs
index 2add5b204..7d5111aca 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Messages;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs
index 389956bd5..548222b52 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Courses;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs
index b289bf4e0..5a8a5ea2c 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Courses;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs
index 93917d900..ccacd757e 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Courses;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs
index ecfa5234e..2d868638c 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs
@@ -1,8 +1,6 @@
using Grand.Domain;
using Grand.Domain.Courses;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs
index 49978c74e..1795067ef 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Courses;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs
index ab3a809eb..9138bbe6b 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs
index ee2af9712..4e331111a 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs
index 81b704569..081a9680f 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Customers;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs
index 3b1610dba..ec248b182 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs
index 1a100964d..a1233704e 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs
@@ -1,8 +1,6 @@
using Grand.Business.Marketing.Services.Customers;
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs
index 6205d5707..2420c000f 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs
index 145503599..391ac72a3 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs
@@ -1,7 +1,6 @@
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Documents;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Documents
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs
index a6977e746..6fb0c1f18 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Documents;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Documents
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs
index bf3944d3a..b3b82c68f 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Knowledgebase;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Knowledgebase
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs
index 75cb28882..d30d574f9 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.Messages;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Newsletters
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs b/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs
index 23ecae883..d41f11bc0 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.Newsletters
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs
index 5ab2ab6c0..3f7483e87 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs
+++ b/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs
@@ -1,7 +1,5 @@
using Grand.Domain;
using Grand.Domain.PushNotifications;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Interfaces.PushNotifications
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs b/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
index 6ee945ad8..0a931ec74 100644
--- a/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Banners
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
index ede34b816..90c21b204 100644
--- a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
@@ -11,10 +11,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Infrastructure;
namespace Grand.Business.Marketing.Services.Campaigns
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
index 58ebab721..15f6b0d4a 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
@@ -9,12 +9,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
index 8c1893000..f353804a1 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
@@ -8,10 +8,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
index ebe4247e0..6fee14153 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
@@ -4,9 +4,6 @@ using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Marketing.Services.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
index eaa853310..3b07051af 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
index 22cb60fee..8fe983a52 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
@@ -3,9 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Contacts
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
index 1c84c4c19..32a5d2923 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
@@ -3,9 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Marketing.Services.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
index b999ca88f..b358b80fc 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
index 73ce17ba8..d9f3771a3 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Marketing.Services.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
index 11828cdcf..daf9b908c 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
index ff302b0aa..c7c18d6d7 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Courses
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
index 95bcd7604..4b3138f2f 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
index 2bdbd2b0a..b8033abc0 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
@@ -6,10 +6,6 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
index a87e5d8fd..623821fb5 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
@@ -4,8 +4,6 @@ using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
index d2dc4799e..32d374fe7 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
@@ -6,9 +6,6 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
index 4efb181c1..28433b632 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
@@ -17,10 +17,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
index d3ddbac64..1b0afb516 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
@@ -6,10 +6,6 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Customers
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
index 6ed779b29..072155787 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
@@ -4,9 +4,6 @@ using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Documents;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Domain.Common;
namespace Grand.Business.Marketing.Services.Documents
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
index ed45a2025..9a7cf64ab 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Documents;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Documents
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
index 4c8e961cc..9e94284a3 100644
--- a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
@@ -10,10 +10,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Knowledgebase
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
index fde844b58..5c9567d5f 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Data;
using Grand.Domain.Messages;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Newsteletters
{
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
index 050d569cb..ddcd26989 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
@@ -3,10 +3,6 @@ using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.Newsteletters
{
diff --git a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
index 9d3de4e51..7e66b8273 100644
--- a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
@@ -8,12 +8,7 @@ using Grand.Domain.PushNotifications;
using Grand.Infrastructure.Extensions;
using MediatR;
using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Services.PushNotifications
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
index 622c49272..17da587e7 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs b/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs
index d22c3c19a..8bec259c3 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Messages.Commands.Models
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
index bfdef407f..edc5d821c 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
@@ -1,5 +1,4 @@
using DotLiquid;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
index dc4e29318..3d7f7ff9c 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 System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
index 04a05e697..b73060396 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
@@ -1,6 +1,5 @@
using DotLiquid;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
index 9b6b3d5f8..c2b6f37e8 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Blogs;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
index 2a3c63d57..1dab274cb 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
@@ -1,5 +1,4 @@
using DotLiquid;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
index a81071b07..9257f0013 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.SharedKernel.Extensions;
-using System.Collections.Generic;
using System.Net;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
index 9c9218412..5132b1f41 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
@@ -1,5 +1,4 @@
using DotLiquid;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs
index dd1715765..f7b010c02 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs
@@ -1,8 +1,5 @@
using DotLiquid;
using Grand.Domain.Messages;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
index 22b2b6db5..cf7198ef5 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
@@ -1,8 +1,6 @@
using DotLiquid;
using Grand.Domain.Orders;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
index ea4a11984..74f6b0ed7 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Knowledgebase;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
index c27c55384..57e86cb46 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
index 24c1cb06d..c49e0c2f3 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using System.Collections.Generic;
using System.Net;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
index 746ef78c8..f3f6c9463 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Localization;
using Grand.Domain.News;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
index 31010d86b..84b3f5d89 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
@@ -1,8 +1,6 @@
using DotLiquid;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
index ab6eb3518..6ccabd922 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
@@ -12,9 +12,6 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
index dad1a8f11..2fba85aed 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
@@ -7,8 +7,6 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
index bb6d421bc..21971a0e4 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
@@ -5,8 +5,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using System;
-using System.Collections.Generic;
using System.Net;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
index 56ef41854..4cbb7c643 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
index 525758006..f81988693 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
index ace2ca1ad..1ccee9d08 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
@@ -1,6 +1,5 @@
using DotLiquid;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
index 109df5285..374244db8 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
index 57e49a0c4..78bb45402 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
using System.Net;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
index f8cf6acb9..9e16499f8 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
@@ -1,7 +1,6 @@
using DotLiquid;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
index b6485fe75..04ad4a802 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
-using System.Collections.Generic;
using System.Net;
namespace Grand.Business.Messages.DotLiquidDrops
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
index 4a1e575df..fa22d270a 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
index e6dd37793..f490155ad 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
@@ -1,5 +1,4 @@
using DotLiquid;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
index c7f011a6c..9421da9be 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
@@ -1,6 +1,5 @@
using DotLiquid;
using Grand.Domain.Vendors;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
index 9d95c82f7..13a120723 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
@@ -1,6 +1,5 @@
using DotLiquid;
using Grand.Domain.Vendors;
-using System.Collections.Generic;
namespace Grand.Business.Messages.DotLiquidDrops
{
diff --git a/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs b/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs
index 791df2e9c..70501365e 100644
--- a/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs
@@ -3,7 +3,6 @@ using Grand.Business.Messages.Events;
using Grand.Domain;
using Grand.Domain.Messages;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Extensions
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs b/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs
index a8b07db58..27d0bf6e4 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs b/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs
index cb8ebdd7c..a91b4cbb4 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs b/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
index 53262e60a..a54442579 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
@@ -9,8 +9,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs b/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs
index 778ea4e22..ca692b55a 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs b/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs
index 0d4a90aed..b0d3ec39c 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs
@@ -1,8 +1,5 @@
using Grand.Domain;
using Grand.Domain.Messages;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Interfaces
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
index 08ac42db7..d4285de9b 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
@@ -1,10 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Queries.Models.Handlers
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
index 430a21421..17c224fdb 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Queries.Models.Handlers
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
index 9db597631..38c2df5e2 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Queries.Models.Handlers
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
index 7c3f49e27..7ed3ec896 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Data;
using Grand.Domain.Vendors;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Queries.Models.Handlers
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs b/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs
index 2110c4a58..f1e055f66 100644
--- a/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Business.Messages.Queries.Models
{
diff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
index 7d8d6f380..b849b84fe 100644
--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Messages;
using Grand.SharedKernel;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Services/EmailSender.cs b/src/Business/Grand.Business.Messages/Services/EmailSender.cs
index 4c6afa4c3..dce1eb19c 100644
--- a/src/Business/Grand.Business.Messages/Services/EmailSender.cs
+++ b/src/Business/Grand.Business.Messages/Services/EmailSender.cs
@@ -4,11 +4,6 @@ using Grand.Domain.Messages;
using MailKit.Net.Smtp;
using MailKit.Security;
using MimeKit;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
index bb07a4b29..b352b9ed7 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
@@ -22,11 +22,7 @@ using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
index d54cb6c0c..c3d9af3c8 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
@@ -7,10 +7,6 @@ using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
index d15f4a538..0d8fa3ace 100644
--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
@@ -4,10 +4,6 @@ using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Domain.Common;
namespace Grand.Business.Messages.Services
diff --git a/src/Business/Grand.Business.Storage/Extensions/Extensions.cs b/src/Business/Grand.Business.Storage/Extensions/Extensions.cs
index dc4e4d883..1a55347d0 100644
--- a/src/Business/Grand.Business.Storage/Extensions/Extensions.cs
+++ b/src/Business/Grand.Business.Storage/Extensions/Extensions.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Http;
-using System.IO;
namespace Grand.Business.Storage.Extensions
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs b/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs
index bf0eed45d..cd4946b82 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Media;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Interfaces
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs b/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs
index 41e79bd3a..ae3b377cb 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs
@@ -1,11 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
using Microsoft.Extensions.FileProviders.Physical;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Interfaces
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs b/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs
index ea27d8a86..c4a1ecefc 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs
@@ -1,5 +1,4 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-using System;
namespace Grand.Business.Storage.Interfaces
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
index 67480a2ec..487b1b260 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
@@ -1,9 +1,7 @@
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Media;
-using System;
using System.Linq.Expressions;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Interfaces
{
diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
index 7ef56ccf8..9991df1d2 100644
--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
@@ -10,10 +10,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using MediatR;
-using System;
-using System.IO;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
index a468621e8..e21002c38 100644
--- a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
using MediatR;
-using System;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs b/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
index 0bb124513..78e952521 100644
--- a/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
+++ b/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
@@ -2,9 +2,6 @@
using Grand.Business.Storage.Interfaces;
using Microsoft.Extensions.FileProviders.Physical;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/DownloadService.cs b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
index 4c9311cfa..e82451d24 100644
--- a/src/Business/Grand.Business.Storage/Services/DownloadService.cs
+++ b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
@@ -3,9 +3,6 @@ using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs b/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
index caaff10d7..e2836f7c7 100644
--- a/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
+++ b/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
@@ -2,12 +2,6 @@
using Grand.Business.Storage.Interfaces;
using Microsoft.Extensions.FileProviders.Physical;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs b/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
index 0ae61e61b..b2c538e4e 100644
--- a/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
+++ b/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
@@ -1,7 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
using Grand.Business.Storage.Interfaces;
using Microsoft.Extensions.FileProviders;
-using System;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index e5bc656c6..e58eae686 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -12,12 +12,7 @@ using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
using SkiaSharp;
-using System;
-using System.IO;
-using System.Linq;
using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Services
{
diff --git a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs b/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
index 31d2cc297..29b3d83b1 100644
--- a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using System;
namespace Grand.Business.Storage.Startup
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
index 37bf385a3..ad2c27405 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
@@ -7,11 +7,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.SharedKernel.Extensions;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Catalog
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
index b73450b06..bdedaa6d2 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Commands.Models;
using Grand.Business.Messages.Interfaces;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Catalog
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
index ed639acb6..efbeb2706 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Messages.Interfaces;
using Grand.Domain.Localization;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Catalog
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
index fdad73944..cb48b3c04 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Common
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
index bbcf97c0b..a9a1b3ea8 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Data;
using Grand.Domain.Logging;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Common
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
index 340c94f4b..8ae3d6ba9 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
@@ -17,14 +17,7 @@ using Grand.Infrastructure.Configuration;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
using System.Xml;
namespace Grand.Business.System.Commands.Handlers.Common
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
index 09b22e2e1..2e5b109c4 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
index c20a07e98..91b9b2cee 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
index 1e3dcfe3d..9ce65c081 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
index 1f9ca6c8e..b5ba9fc72 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
index 015490fc5..912bee66b 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
@@ -15,11 +15,7 @@ using Grand.Domain.Shipping;
using Grand.Domain.Tax;
using Grand.Domain.Vendors;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
index c99a2a958..5ead94141 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
@@ -2,9 +2,6 @@
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
index 139ffeb37..b6eb06d81 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using Grand.Business.Storage.Interfaces;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
index c99405566..038458e55 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Messages.DotLiquidDrops;
using Grand.Domain.Stores;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
index a752cfd59..29949a4a5 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Messages
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
index 14d7c7460..d9f188372 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Security;
using Grand.Business.System.Commands.Models.Security;
using Grand.Domain.Permissions;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Security
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
index 8cf285646..6f225879d 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
@@ -6,9 +6,6 @@ using Grand.Business.System.Commands.Models.Security;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Security
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
index 98aa52902..cfcc7ea08 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.System.Commands.Models.Security;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Commands.Handlers.Security
{
diff --git a/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs b/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs
index 7207909a0..2513a8e20 100644
--- a/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Admin;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.Admin
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs b/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs
index 1eee9785c..1532264c1 100644
--- a/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs
+++ b/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Messages;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.ExportImport
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs b/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs
index 9afca1bce..fa5523b72 100644
--- a/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs
+++ b/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs
@@ -1,7 +1,4 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Grand.Business.System.Interfaces.ExportImport
+namespace Grand.Business.System.Interfaces.ExportImport
{
/// <summary>
/// Import manager interface
diff --git a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs b/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs
index e59fd7e54..7cf794071 100644
--- a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs
@@ -1,5 +1,4 @@
using Grand.Business.System.Utilities;
-using System.Collections.Generic;
namespace Grand.Business.System.Interfaces.Installation
{
diff --git a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs b/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs
index c288154c6..4780e0d0d 100644
--- a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.Installation
{
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs b/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
index 673316420..50699e0fe 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
@@ -2,9 +2,6 @@ using Grand.Business.System.Utilities;
using Grand.Domain;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.Reports
{
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs b/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
index f6255bebd..78a9e0ac0 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
@@ -3,9 +3,6 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.Reports
{
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs b/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs
index 3f5b9475b..65aa2d5a4 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Utilities;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.Reports
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs b/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs
index a0a2e58a6..3588ed9ed 100644
--- a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Business.System.Interfaces.ScheduleTasks
+namespace Grand.Business.System.Interfaces.ScheduleTasks
{
public interface IScheduleTask
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs b/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs
index e788350dd..19e8ecedb 100644
--- a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs
+++ b/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Tasks;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Interfaces.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
index 450cf644b..f2d474a8b 100644
--- a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
+++ b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
@@ -3,9 +3,6 @@ using Grand.Business.System.Utilities;
using Grand.Infrastructure.Caching;
using Grand.Domain.Admin;
using Grand.Domain.Data;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Admin
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs
index c87b878b4..447b40188 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure;
using Grand.Domain.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
index 3e73b8cdd..b2825ecdd 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
@@ -1,8 +1,6 @@
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Domain.Common;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
index da97e056d..59ab87288 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Infrastructure.Caching;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
index 164137e8b..f96cd629f 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
index 2747c4e49..ef2b3a0ea 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
index b8efe098b..dd02544fa 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
index 507c6e34d..16ac748a1 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
index 34072a593..f407cc7bf 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
index ac6a780c7..f61f719de 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
index cc64449b5..7a9d966de 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
index a201e5a14..c38d60f9e 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
@@ -1,6 +1,5 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
index a32e42a58..7fb6c45fe 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
@@ -1,8 +1,6 @@
using Grand.Business.Customers.Interfaces;
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Domain.Common;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
index b5c5d0e88..4a25a8b2c 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
@@ -6,8 +6,6 @@ using Grand.Business.Customers.Interfaces;
using Grand.Business.Messages.Interfaces;
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Domain.Localization;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
index f34c89349..1685d0c3a 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
@@ -4,7 +4,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Business.System.Commands.Models.Common;
using Grand.Business.System.Interfaces.ScheduleTasks;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
index 1a3084df0..3728b4c4a 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
@@ -1,7 +1,5 @@
using Grand.Business.Messages.Interfaces;
using Grand.Business.System.Interfaces.ScheduleTasks;
-using System;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Common.Extensions;
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
index dd13ef50d..6421401d2 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
@@ -1,10 +1,6 @@
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Domain.Data;
using Grand.Domain.Tasks;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
index 55fcd4c48..04d26ac30 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
@@ -2,8 +2,6 @@
using Grand.Business.System.Interfaces.ScheduleTasks;
using Grand.Domain.Directory;
using Grand.Domain.Tasks;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs b/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
index 99ddd3d84..687d06793 100644
--- a/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
+++ b/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
@@ -19,12 +19,6 @@ using Grand.Infrastructure.Extensions;
using Microsoft.Extensions.DependencyInjection;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.ExportImport
{
diff --git a/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs b/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
index fb36f4eab..42c3ce17d 100644
--- a/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
+++ b/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
@@ -25,11 +25,6 @@ using Grand.Domain.Tax;
using Grand.SharedKernel;
using Microsoft.AspNetCore.StaticFiles;
using NPOI.XSSF.UserModel;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.ExportImport
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
index dc999ad20..5df7b1b7b 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
index 8c047bfdd..5495f2e4d 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
@@ -1,9 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Affiliates;
using Grand.Domain.Common;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
index f19562a5b..a196b2707 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
@@ -2,9 +2,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Blogs;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
index f6a53c881..ee634c2db 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
index b7449dcae..080d1d79e 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
@@ -4,11 +4,6 @@ using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
index 3baa0c162..13cafbae6 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
@@ -4,11 +4,6 @@ using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
index 08a03931a..29aa7fd5b 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
index aeccdb7d5..fae015768 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
@@ -1,7 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
index 9d37b95c4..6cecf8e18 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
index 67a6e65c0..5d29ca3fa 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
index f27e2e68e..93b963af1 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
@@ -1,8 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Directory;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
index 7918da5ff..d89b46d03 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
index 426741166..52c4e2a58 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
@@ -1,9 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
index bb40c4a20..a7d05db2d 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
index e18f0cbff..a27d49bbd 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
@@ -1,9 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Discounts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
index b7f0c2e61..be450e4b3 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
index 8ad076ef3..e24197ede 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
@@ -1,6 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Localization;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
index c187c6e4d..685ee321e 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
@@ -2,9 +2,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.SharedKernel.Extensions;
using Microsoft.Extensions.DependencyInjection;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
index 79a9bcf03..e2226794b 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Directory;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
index 66d21b9ab..a628f4ce9 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
index 5e05443d1..4e2af867f 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
index 960fe4a07..1923b39a7 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
@@ -1,9 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Messages;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
index fa5b0d32f..be6e4d4d9 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
@@ -2,10 +2,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.News;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
index e4bdcdc68..da47867aa 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
index d8442cbcf..ca65752f9 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
@@ -1,6 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Orders;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
index 1187ae013..ca87c9612 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Pages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
index b7d9afc21..74d859ed1 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
@@ -1,10 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Pages;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
index 841a148e2..167718c20 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
@@ -1,9 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
index 063cf8fa6..3dfb9d664 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
index 8c1f29a1e..a900c7e1f 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
index efce29179..812ba9ba7 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
@@ -5,11 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
index 2627dad72..e8273163c 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
@@ -1,7 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Common;
using Grand.Domain.Stores;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
index 1bec92410..c243663cc 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Tasks;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
index 511d48815..47df64678 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
@@ -24,11 +24,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Domain.Vendors;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
index b130edc42..d9cf76053 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
index 1e1f01aea..8b63d01e2 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Catalog;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
index 6ce8fc857..7b0c43ab4 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
@@ -1,8 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Stores;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
index b8f87286f..6c82caa22 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
@@ -1,7 +1,5 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Tax;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
index a6cfc5a90..12f4c5a44 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
@@ -2,8 +2,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Seo;
using Grand.Domain.Vendors;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
index 927bc7a1e..1680889ed 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
@@ -1,10 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
index a7c689d92..748b308a8 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
@@ -1,10 +1,6 @@
using Grand.Business.System.Interfaces.Installation;
using Grand.Business.System.Utilities;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Text.RegularExpressions;
using System.Xml;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
index 5996a6b1a..891dbd7c2 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
@@ -36,10 +36,6 @@ using Grand.SharedKernel;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Installation
{
diff --git a/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs b/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
index 73240cd84..c38cca8a9 100644
--- a/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
+++ b/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
@@ -1,6 +1,5 @@
//Contribution: Orchard project (http://www.orchardproject.net/)
using Grand.Business.System.Interfaces.MachineNameProvider;
-using System;
namespace Grand.Business.System.Services.MachineNameProvider
{
diff --git a/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs b/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
index 9e0ca367b..ab224ba89 100644
--- a/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
+++ b/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
@@ -1,6 +1,5 @@
//Contribution: Orchard project (http://www.orchardproject.net/)
using Grand.Business.System.Interfaces.MachineNameProvider;
-using System;
namespace Grand.Business.System.Services.MachineNameProvider
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationActivityLogTypes.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationActivityLogTypes.cs
index 7d2caebe4..729f14c95 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationActivityLogTypes.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationActivityLogTypes.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Logging;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
index ddc8b637d..6146c938e 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
@@ -6,8 +6,6 @@ using Grand.Domain.Data;
using Grand.Domain.Permissions;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
index e99389592..ed1df76b2 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Services.Security;
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
index 9ba44c5d8..03663fe59 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Migrations;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.IO;
-using System.Linq;
using System.Text.Json;
namespace Grand.Business.System.Services.Migrations._1._1
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
index c57b134bb..90a11b024 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
using System.Text.Json;
namespace Grand.Business.System.Services.Migrations._1._1
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
index b4c9108c4..f7b6a4ac2 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Localization;
using Grand.Infrastructure.Migrations;
using Grand.SharedKernel.Extensions;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.IO;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
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 c660d9da8..f4cbb0f53 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
@@ -3,8 +3,6 @@ using Grand.Domain.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
index a644f085a..4afe32203 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._1._1
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
index 7575dd814..b360884b5 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations._2._2
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
index 5c8a731ac..9ac540ca9 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Logging;
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.System.Services.Migrations
{
diff --git a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
index b9cbc9178..8657a24fc 100644
--- a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
@@ -8,10 +8,6 @@ using Grand.Domain.Data;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Reports
{
diff --git a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
index f00682e71..ff8b9eb0c 100644
--- a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
@@ -7,11 +7,7 @@ using Grand.Domain.Data;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Services.Reports
{
diff --git a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
index f0f73a2e9..ab6c0f249 100644
--- a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
@@ -2,9 +2,6 @@
using Grand.Business.System.Utilities;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Business.System.Services.Reports
{
diff --git a/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs b/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs
index b0b238499..b0a72503b 100644
--- a/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs
+++ b/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Business.System.Utilities
{
/// <summary>
diff --git a/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs b/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs
index 8a6e5471f..009126783 100644
--- a/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs
+++ b/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs
@@ -1,5 +1,4 @@
using System.Net.Http;
-using System.Threading.Tasks;
namespace Grand.Business.System.Utilities
{
diff --git a/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs b/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs
index f9c519484..243daa1d8 100644
--- a/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs
+++ b/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.System.Utilities
{
/// <summary>
/// Language class for installation process
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyByName.cs b/src/Business/Grand.Business.System/Utilities/PropertyByName.cs
index 36657877c..68593a906 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyByName.cs
+++ b/src/Business/Grand.Business.System/Utilities/PropertyByName.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.System.Utilities
{
/// <summary>
/// A helper class to access the property by name
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs b/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
index aaae36208..534878b5f 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
+++ b/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
@@ -1,6 +1,4 @@
using NPOI.SS.UserModel;
-using System;
-using System.Collections.Generic;
namespace Grand.Business.System.Utilities
{
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyManager.cs b/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
index 2b10831b5..ae49678f5 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
+++ b/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
@@ -1,6 +1,4 @@
using NPOI.SS.UserModel;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.System.Utilities
{
diff --git a/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs b/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs
index 6b45b7e30..9c59a9402 100644
--- a/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs
+++ b/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.System.Utilities
{
public partial class ReportPeriodOrder
{
diff --git a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs
index 7aaca5077..374c6bf1b 100644
--- a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs
+++ b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Services.Security;
using Grand.Domain.Admin;
-using System.Collections.Generic;
namespace Grand.Business.System.Utilities
{
diff --git a/src/Core/Grand.Domain/Admin/AdminSiteMap.cs b/src/Core/Grand.Domain/Admin/AdminSiteMap.cs
index 36169aa9a..279ca8d7f 100644
--- a/src/Core/Grand.Domain/Admin/AdminSiteMap.cs
+++ b/src/Core/Grand.Domain/Admin/AdminSiteMap.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain.Admin
+namespace Grand.Domain.Admin
{
/// <summary>
/// Represents an admin menu
diff --git a/src/Core/Grand.Domain/BaseEntity.cs b/src/Core/Grand.Domain/BaseEntity.cs
index 82b2e17fd..0e62a7013 100644
--- a/src/Core/Grand.Domain/BaseEntity.cs
+++ b/src/Core/Grand.Domain/BaseEntity.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Common;
-using System.Collections.Generic;
namespace Grand.Domain
{
diff --git a/src/Core/Grand.Domain/Blogs/BlogCategory.cs b/src/Core/Grand.Domain/Blogs/BlogCategory.cs
index 07b20440f..37c880760 100644
--- a/src/Core/Grand.Domain/Blogs/BlogCategory.cs
+++ b/src/Core/Grand.Domain/Blogs/BlogCategory.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Blogs
{
diff --git a/src/Core/Grand.Domain/Blogs/BlogComment.cs b/src/Core/Grand.Domain/Blogs/BlogComment.cs
index d30d74dae..a55779746 100644
--- a/src/Core/Grand.Domain/Blogs/BlogComment.cs
+++ b/src/Core/Grand.Domain/Blogs/BlogComment.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Blogs
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Blogs/BlogExtensions.cs b/src/Core/Grand.Domain/Blogs/BlogExtensions.cs
index d454dbcc4..a02a2e63f 100644
--- a/src/Core/Grand.Domain/Blogs/BlogExtensions.cs
+++ b/src/Core/Grand.Domain/Blogs/BlogExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Grand.Domain.Blogs
+namespace Grand.Domain.Blogs
{
public static class BlogExtensions
{
diff --git a/src/Core/Grand.Domain/Blogs/BlogPost.cs b/src/Core/Grand.Domain/Blogs/BlogPost.cs
index d8ccede40..6157a5b91 100644
--- a/src/Core/Grand.Domain/Blogs/BlogPost.cs
+++ b/src/Core/Grand.Domain/Blogs/BlogPost.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Localization;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Blogs
{
diff --git a/src/Core/Grand.Domain/Catalog/Bid.cs b/src/Core/Grand.Domain/Catalog/Bid.cs
index 67461e416..08a585d92 100644
--- a/src/Core/Grand.Domain/Catalog/Bid.cs
+++ b/src/Core/Grand.Domain/Catalog/Bid.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Catalog
+namespace Grand.Domain.Catalog
{
/// <summary>
/// Represents a auction bid
diff --git a/src/Core/Grand.Domain/Catalog/Brand.cs b/src/Core/Grand.Domain/Catalog/Brand.cs
index f4d707827..ae3245ef1 100644
--- a/src/Core/Grand.Domain/Catalog/Brand.cs
+++ b/src/Core/Grand.Domain/Catalog/Brand.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/CatalogSettings.cs b/src/Core/Grand.Domain/Catalog/CatalogSettings.cs
index a97cd5547..0d7804f3d 100644
--- a/src/Core/Grand.Domain/Catalog/CatalogSettings.cs
+++ b/src/Core/Grand.Domain/Catalog/CatalogSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/Category.cs b/src/Core/Grand.Domain/Catalog/Category.cs
index 1a0a560df..4860bdc34 100644
--- a/src/Core/Grand.Domain/Catalog/Category.cs
+++ b/src/Core/Grand.Domain/Catalog/Category.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/Collection.cs b/src/Core/Grand.Domain/Catalog/Collection.cs
index c5cdaee77..72d9726b0 100644
--- a/src/Core/Grand.Domain/Catalog/Collection.cs
+++ b/src/Core/Grand.Domain/Catalog/Collection.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/InventoryJournal.cs b/src/Core/Grand.Domain/Catalog/InventoryJournal.cs
index f7ad5e3b6..caca7e81b 100644
--- a/src/Core/Grand.Domain/Catalog/InventoryJournal.cs
+++ b/src/Core/Grand.Domain/Catalog/InventoryJournal.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/MerchandiseReturnAction.cs b/src/Core/Grand.Domain/Catalog/MerchandiseReturnAction.cs
index 64337cc8d..03da8dee2 100644
--- a/src/Core/Grand.Domain/Catalog/MerchandiseReturnAction.cs
+++ b/src/Core/Grand.Domain/Catalog/MerchandiseReturnAction.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Catalog/OutOfStockSubscription.cs b/src/Core/Grand.Domain/Catalog/OutOfStockSubscription.cs
index 0eaed153d..96d5d454b 100644
--- a/src/Core/Grand.Domain/Catalog/OutOfStockSubscription.cs
+++ b/src/Core/Grand.Domain/Catalog/OutOfStockSubscription.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/PredefinedProductAttributeValue.cs b/src/Core/Grand.Domain/Catalog/PredefinedProductAttributeValue.cs
index 7334f9bb6..d3e3dde65 100644
--- a/src/Core/Grand.Domain/Catalog/PredefinedProductAttributeValue.cs
+++ b/src/Core/Grand.Domain/Catalog/PredefinedProductAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/Product.cs b/src/Core/Grand.Domain/Catalog/Product.cs
index 79bc67aa4..07d321bf0 100644
--- a/src/Core/Grand.Domain/Catalog/Product.cs
+++ b/src/Core/Grand.Domain/Catalog/Product.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductAlsoPurchased.cs b/src/Core/Grand.Domain/Catalog/ProductAlsoPurchased.cs
index 9c83184ce..555347fb3 100644
--- a/src/Core/Grand.Domain/Catalog/ProductAlsoPurchased.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductAlsoPurchased.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Catalog
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Catalog/ProductAttribute.cs b/src/Core/Grand.Domain/Catalog/ProductAttribute.cs
index 1ee2b58af..7f88f60f9 100644
--- a/src/Core/Grand.Domain/Catalog/ProductAttribute.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductAttribute.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductAttributeCombination.cs b/src/Core/Grand.Domain/Catalog/ProductAttributeCombination.cs
index dc133f45d..d8e7e57ed 100644
--- a/src/Core/Grand.Domain/Catalog/ProductAttributeCombination.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductAttributeCombination.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs b/src/Core/Grand.Domain/Catalog/ProductAttributeMapping.cs
index 4287c7315..10db1d82c 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.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductAttributeValue.cs b/src/Core/Grand.Domain/Catalog/ProductAttributeValue.cs
index f918849b5..0f6b6bad8 100644
--- a/src/Core/Grand.Domain/Catalog/ProductAttributeValue.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductDeleted.cs b/src/Core/Grand.Domain/Catalog/ProductDeleted.cs
index eb3e2f87a..80a85b91f 100644
--- a/src/Core/Grand.Domain/Catalog/ProductDeleted.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductDeleted.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Catalog
+namespace Grand.Domain.Catalog
{
public partial class ProductDeleted: Product
{
diff --git a/src/Core/Grand.Domain/Catalog/ProductExtensions.cs b/src/Core/Grand.Domain/Catalog/ProductExtensions.cs
index 2c750f9b5..309b608c0 100644
--- a/src/Core/Grand.Domain/Catalog/ProductExtensions.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Grand.Domain.Catalog
+namespace Grand.Domain.Catalog
{
/// <summary>
/// Product extensions
diff --git a/src/Core/Grand.Domain/Catalog/ProductReservation.cs b/src/Core/Grand.Domain/Catalog/ProductReservation.cs
index 17756f32c..26eb45849 100644
--- a/src/Core/Grand.Domain/Catalog/ProductReservation.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductReservation.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Catalog
+namespace Grand.Domain.Catalog
{
/// <summary>
/// Represents a product reservation
diff --git a/src/Core/Grand.Domain/Catalog/ProductReview.cs b/src/Core/Grand.Domain/Catalog/ProductReview.cs
index 4bad532c2..4fee92d24 100644
--- a/src/Core/Grand.Domain/Catalog/ProductReview.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductReview.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace Grand.Domain.Catalog
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Catalog/ProductTag.cs b/src/Core/Grand.Domain/Catalog/ProductTag.cs
index cbb9eb6a9..badb33447 100644
--- a/src/Core/Grand.Domain/Catalog/ProductTag.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductTag.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/RecentlyViewedProduct.cs b/src/Core/Grand.Domain/Catalog/RecentlyViewedProduct.cs
index acf6f4aa4..8808fb452 100644
--- a/src/Core/Grand.Domain/Catalog/RecentlyViewedProduct.cs
+++ b/src/Core/Grand.Domain/Catalog/RecentlyViewedProduct.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Catalog
+namespace Grand.Domain.Catalog
{
public partial class RecentlyViewedProduct: BaseEntity
{
diff --git a/src/Core/Grand.Domain/Catalog/SpecificationAttribute.cs b/src/Core/Grand.Domain/Catalog/SpecificationAttribute.cs
index 031a67a47..0d382773f 100644
--- a/src/Core/Grand.Domain/Catalog/SpecificationAttribute.cs
+++ b/src/Core/Grand.Domain/Catalog/SpecificationAttribute.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
diff --git a/src/Core/Grand.Domain/Catalog/SpecificationAttributeOption.cs b/src/Core/Grand.Domain/Catalog/SpecificationAttributeOption.cs
index 3b67249a0..1d76a6443 100644
--- a/src/Core/Grand.Domain/Catalog/SpecificationAttributeOption.cs
+++ b/src/Core/Grand.Domain/Catalog/SpecificationAttributeOption.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Catalog
{
diff --git a/src/Core/Grand.Domain/Catalog/TierPrice.cs b/src/Core/Grand.Domain/Catalog/TierPrice.cs
index 829369fed..b746d2230 100644
--- a/src/Core/Grand.Domain/Catalog/TierPrice.cs
+++ b/src/Core/Grand.Domain/Catalog/TierPrice.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Catalog
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Cms/WidgetSettings.cs b/src/Core/Grand.Domain/Cms/WidgetSettings.cs
index 28816a7e3..879a80dc0 100644
--- a/src/Core/Grand.Domain/Cms/WidgetSettings.cs
+++ b/src/Core/Grand.Domain/Cms/WidgetSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Cms
{
diff --git a/src/Core/Grand.Domain/Common/Address.cs b/src/Core/Grand.Domain/Common/Address.cs
index cd4452745..d28175799 100644
--- a/src/Core/Grand.Domain/Common/Address.cs
+++ b/src/Core/Grand.Domain/Common/Address.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Grand.Domain.Common
+namespace Grand.Domain.Common
{
public partial class Address : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Common/AddressAttribute.cs b/src/Core/Grand.Domain/Common/AddressAttribute.cs
index 171fa8014..3288efbcb 100644
--- a/src/Core/Grand.Domain/Common/AddressAttribute.cs
+++ b/src/Core/Grand.Domain/Common/AddressAttribute.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Common
{
diff --git a/src/Core/Grand.Domain/Common/AddressAttributeValue.cs b/src/Core/Grand.Domain/Common/AddressAttributeValue.cs
index 64287f75a..17817c706 100644
--- a/src/Core/Grand.Domain/Common/AddressAttributeValue.cs
+++ b/src/Core/Grand.Domain/Common/AddressAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Common
{
diff --git a/src/Core/Grand.Domain/Common/CommonSettings.cs b/src/Core/Grand.Domain/Common/CommonSettings.cs
index 607ec4ac4..bab354807 100644
--- a/src/Core/Grand.Domain/Common/CommonSettings.cs
+++ b/src/Core/Grand.Domain/Common/CommonSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Common
{
diff --git a/src/Core/Grand.Domain/Common/UserFieldExtensions.cs b/src/Core/Grand.Domain/Common/UserFieldExtensions.cs
index f81e362b4..cb0d39624 100644
--- a/src/Core/Grand.Domain/Common/UserFieldExtensions.cs
+++ b/src/Core/Grand.Domain/Common/UserFieldExtensions.cs
@@ -1,6 +1,4 @@
using Grand.SharedKernel.Extensions;
-using System;
-using System.Linq;
namespace Grand.Domain.Common
{
diff --git a/src/Core/Grand.Domain/Courses/Course.cs b/src/Core/Grand.Domain/Courses/Course.cs
index ff09f91d8..f4daa59df 100644
--- a/src/Core/Grand.Domain/Courses/Course.cs
+++ b/src/Core/Grand.Domain/Courses/Course.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Courses
{
diff --git a/src/Core/Grand.Domain/Customers/Customer.cs b/src/Core/Grand.Domain/Customers/Customer.cs
index f8539ad3e..f04b1139e 100644
--- a/src/Core/Grand.Domain/Customers/Customer.cs
+++ b/src/Core/Grand.Domain/Customers/Customer.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Customers
{
diff --git a/src/Core/Grand.Domain/Customers/CustomerAction.cs b/src/Core/Grand.Domain/Customers/CustomerAction.cs
index 2c5f29f30..ddea0d3a4 100644
--- a/src/Core/Grand.Domain/Customers/CustomerAction.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerAction.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace Grand.Domain.Customers
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Customers/CustomerActionHistory.cs b/src/Core/Grand.Domain/Customers/CustomerActionHistory.cs
index 3adc544a3..df6f38837 100644
--- a/src/Core/Grand.Domain/Customers/CustomerActionHistory.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerActionHistory.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Customers
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Customers/CustomerActionType.cs b/src/Core/Grand.Domain/Customers/CustomerActionType.cs
index 21f4caefa..82ac1267a 100644
--- a/src/Core/Grand.Domain/Customers/CustomerActionType.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerActionType.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain.Customers
+namespace Grand.Domain.Customers
{
/// <summary>
/// Represents a Customer ActionType
diff --git a/src/Core/Grand.Domain/Customers/CustomerAttribute.cs b/src/Core/Grand.Domain/Customers/CustomerAttribute.cs
index 665d01d78..e4d8f1166 100644
--- a/src/Core/Grand.Domain/Customers/CustomerAttribute.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerAttribute.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Customers
{
diff --git a/src/Core/Grand.Domain/Customers/CustomerAttributeValue.cs b/src/Core/Grand.Domain/Customers/CustomerAttributeValue.cs
index b6188818e..cd6862527 100644
--- a/src/Core/Grand.Domain/Customers/CustomerAttributeValue.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Customers
{
diff --git a/src/Core/Grand.Domain/Customers/CustomerExtensions.cs b/src/Core/Grand.Domain/Customers/CustomerExtensions.cs
index 95337223e..fbad82bd6 100644
--- a/src/Core/Grand.Domain/Customers/CustomerExtensions.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerExtensions.cs
@@ -1,7 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Domain.Customers
{
diff --git a/src/Core/Grand.Domain/Customers/CustomerHistoryPassword.cs b/src/Core/Grand.Domain/Customers/CustomerHistoryPassword.cs
index 0ed9e55d2..c1077afd0 100644
--- a/src/Core/Grand.Domain/Customers/CustomerHistoryPassword.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerHistoryPassword.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Customers
+namespace Grand.Domain.Customers
{
/// <summary>
/// Represents a Customer History Password
diff --git a/src/Core/Grand.Domain/Customers/CustomerNote.cs b/src/Core/Grand.Domain/Customers/CustomerNote.cs
index cb013f8c6..7d9ac2c8a 100644
--- a/src/Core/Grand.Domain/Customers/CustomerNote.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerNote.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Customers
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Customers/CustomerReminder.cs b/src/Core/Grand.Domain/Customers/CustomerReminder.cs
index 175b69b30..0d2effb7d 100644
--- a/src/Core/Grand.Domain/Customers/CustomerReminder.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerReminder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace Grand.Domain.Customers
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Customers/CustomerReminderHistory.cs b/src/Core/Grand.Domain/Customers/CustomerReminderHistory.cs
index 4366dec5f..8a25a4529 100644
--- a/src/Core/Grand.Domain/Customers/CustomerReminderHistory.cs
+++ b/src/Core/Grand.Domain/Customers/CustomerReminderHistory.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace Grand.Domain.Customers
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Customers/ExternalAuthenticationSettings.cs b/src/Core/Grand.Domain/Customers/ExternalAuthenticationSettings.cs
index a79eb2590..5a3ed1f75 100644
--- a/src/Core/Grand.Domain/Customers/ExternalAuthenticationSettings.cs
+++ b/src/Core/Grand.Domain/Customers/ExternalAuthenticationSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Customers
{
diff --git a/src/Core/Grand.Domain/Data/DataSettingsManager.cs b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
index 4cfd4515f..849dd40cd 100644
--- a/src/Core/Grand.Domain/Data/DataSettingsManager.cs
+++ b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
@@ -1,8 +1,5 @@
using Grand.SharedKernel.Extensions;
-using System.IO;
-using System.Linq;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Grand.Domain.Data
{
diff --git a/src/Core/Grand.Domain/Data/IDatabaseContext.cs b/src/Core/Grand.Domain/Data/IDatabaseContext.cs
index 6ff8a7622..b62847284 100644
--- a/src/Core/Grand.Domain/Data/IDatabaseContext.cs
+++ b/src/Core/Grand.Domain/Data/IDatabaseContext.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Grand.Domain.Data
+namespace Grand.Domain.Data
{
public interface IDatabaseContext
{
diff --git a/src/Core/Grand.Domain/Data/IRepository.cs b/src/Core/Grand.Domain/Data/IRepository.cs
index 1dbb54602..8673a3a6f 100644
--- a/src/Core/Grand.Domain/Data/IRepository.cs
+++ b/src/Core/Grand.Domain/Data/IRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
+using System.Linq.Expressions;
namespace Grand.Domain.Data
{
diff --git a/src/Core/Grand.Domain/Data/IStoreFilesContext.cs b/src/Core/Grand.Domain/Data/IStoreFilesContext.cs
index 5e84409ec..136831e28 100644
--- a/src/Core/Grand.Domain/Data/IStoreFilesContext.cs
+++ b/src/Core/Grand.Domain/Data/IStoreFilesContext.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Domain.Data
+namespace Grand.Domain.Data
{
public interface IStoreFilesContext
{
diff --git a/src/Core/Grand.Domain/Data/MigrationDb.cs b/src/Core/Grand.Domain/Data/MigrationDb.cs
index 4a262ea07..96ebaab4a 100644
--- a/src/Core/Grand.Domain/Data/MigrationDb.cs
+++ b/src/Core/Grand.Domain/Data/MigrationDb.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Data
+namespace Grand.Domain.Data
{
public class MigrationDb : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs b/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs
index d4dde2371..ce66a20dc 100644
--- a/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/BsonUtcDateTimeSerializer.cs
@@ -1,6 +1,5 @@
using MongoDB.Bson.Serialization;
using MongoDB.Bson.Serialization.Serializers;
-using System;
namespace Grand.Domain.Data.Mongo
{
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
index 1899080a0..e7e42df32 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
@@ -1,9 +1,5 @@
using MongoDB.Bson;
using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Domain.Data.Mongo
{
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs b/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
index f036dbb14..76462276a 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoDBMapperConfiguration.cs
@@ -2,8 +2,6 @@
using MongoDB.Bson.Serialization.Conventions;
using MongoDB.Bson.Serialization.Options;
using MongoDB.Bson.Serialization.Serializers;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Data.Mongo
{
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs b/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs
index 2b52dd141..9c2078bd6 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoRepository.cs
@@ -1,12 +1,8 @@
using MongoDB.Bson;
using MongoDB.Driver;
using MongoDB.Driver.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
-using System.Threading.Tasks;
namespace Grand.Domain.Data.Mongo
{
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs b/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs
index 7c590bd94..e462f605d 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoStoreFilesContext.cs
@@ -1,6 +1,5 @@
using MongoDB.Bson;
using MongoDB.Driver;
-using System.Threading.Tasks;
namespace Grand.Domain.Data.Mongo
{
diff --git a/src/Core/Grand.Domain/Data/OrderBuilder.cs b/src/Core/Grand.Domain/Data/OrderBuilder.cs
index bb05cfb5b..afb4e4c0b 100644
--- a/src/Core/Grand.Domain/Data/OrderBuilder.cs
+++ b/src/Core/Grand.Domain/Data/OrderBuilder.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
namespace Grand.Domain.Data
{
diff --git a/src/Core/Grand.Domain/Data/UpdateBuilder.cs b/src/Core/Grand.Domain/Data/UpdateBuilder.cs
index 988b7197c..4141d7f12 100644
--- a/src/Core/Grand.Domain/Data/UpdateBuilder.cs
+++ b/src/Core/Grand.Domain/Data/UpdateBuilder.cs
@@ -1,6 +1,4 @@
using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
using System.Linq.Expressions;
namespace Grand.Domain.Data
diff --git a/src/Core/Grand.Domain/Directory/Country.cs b/src/Core/Grand.Domain/Directory/Country.cs
index 50a758dc0..9f5feda05 100644
--- a/src/Core/Grand.Domain/Directory/Country.cs
+++ b/src/Core/Grand.Domain/Directory/Country.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Directory
{
diff --git a/src/Core/Grand.Domain/Directory/Currency.cs b/src/Core/Grand.Domain/Directory/Currency.cs
index 33f1496ed..cedc8c4ad 100644
--- a/src/Core/Grand.Domain/Directory/Currency.cs
+++ b/src/Core/Grand.Domain/Directory/Currency.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Directory
{
diff --git a/src/Core/Grand.Domain/Directory/ExchangeRate.cs b/src/Core/Grand.Domain/Directory/ExchangeRate.cs
index 363ba3a8f..7b5f6ac6b 100644
--- a/src/Core/Grand.Domain/Directory/ExchangeRate.cs
+++ b/src/Core/Grand.Domain/Directory/ExchangeRate.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Directory
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Directory/StateProvince.cs b/src/Core/Grand.Domain/Directory/StateProvince.cs
index 072af242a..c43bc4b3b 100644
--- a/src/Core/Grand.Domain/Directory/StateProvince.cs
+++ b/src/Core/Grand.Domain/Directory/StateProvince.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Directory
{
diff --git a/src/Core/Grand.Domain/Discounts/Discount.cs b/src/Core/Grand.Domain/Discounts/Discount.cs
index 0d6e99c71..a8503b301 100644
--- a/src/Core/Grand.Domain/Discounts/Discount.cs
+++ b/src/Core/Grand.Domain/Discounts/Discount.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Discounts
{
diff --git a/src/Core/Grand.Domain/Discounts/DiscountUsageHistory.cs b/src/Core/Grand.Domain/Discounts/DiscountUsageHistory.cs
index 0bc499718..6aacc29a0 100644
--- a/src/Core/Grand.Domain/Discounts/DiscountUsageHistory.cs
+++ b/src/Core/Grand.Domain/Discounts/DiscountUsageHistory.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Discounts
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Documents/Document.cs b/src/Core/Grand.Domain/Documents/Document.cs
index 174a77cc4..3fb414eab 100644
--- a/src/Core/Grand.Domain/Documents/Document.cs
+++ b/src/Core/Grand.Domain/Documents/Document.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Permissions;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Documents
{
diff --git a/src/Core/Grand.Domain/History/HistoryObject.cs b/src/Core/Grand.Domain/History/HistoryObject.cs
index 303b7f6cf..2439495ce 100644
--- a/src/Core/Grand.Domain/History/HistoryObject.cs
+++ b/src/Core/Grand.Domain/History/HistoryObject.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.History
+namespace Grand.Domain.History
{
public class HistoryObject: BaseEntity
{
diff --git a/src/Core/Grand.Domain/IPagedList.cs b/src/Core/Grand.Domain/IPagedList.cs
index 74d6339d4..2472468c8 100644
--- a/src/Core/Grand.Domain/IPagedList.cs
+++ b/src/Core/Grand.Domain/IPagedList.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain
+namespace Grand.Domain
{
/// <summary>
/// Paged list interface
diff --git a/src/Core/Grand.Domain/Knowledgebase/ITreeNode.cs b/src/Core/Grand.Domain/Knowledgebase/ITreeNode.cs
index d76254f6d..d3b50373f 100644
--- a/src/Core/Grand.Domain/Knowledgebase/ITreeNode.cs
+++ b/src/Core/Grand.Domain/Knowledgebase/ITreeNode.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain.Knowledgebase
+namespace Grand.Domain.Knowledgebase
{
public interface ITreeNode
{
diff --git a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticle.cs b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticle.cs
index 49b275a6b..beb818216 100644
--- a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticle.cs
+++ b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticle.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Knowledgebase
{
diff --git a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticleComment.cs b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticleComment.cs
index 247080c48..d1a4073b5 100644
--- a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticleComment.cs
+++ b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseArticleComment.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Knowledgebase
+namespace Grand.Domain.Knowledgebase
{
public partial class KnowledgebaseArticleComment : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseCategory.cs b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseCategory.cs
index 358cb2742..722ccd2ca 100644
--- a/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseCategory.cs
+++ b/src/Core/Grand.Domain/Knowledgebase/KnowledgebaseCategory.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Knowledgebase
{
diff --git a/src/Core/Grand.Domain/Localization/ITranslationEntity.cs b/src/Core/Grand.Domain/Localization/ITranslationEntity.cs
index 614b72f3f..2e920d9b3 100644
--- a/src/Core/Grand.Domain/Localization/ITranslationEntity.cs
+++ b/src/Core/Grand.Domain/Localization/ITranslationEntity.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace Grand.Domain.Localization
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Localization/Language.cs b/src/Core/Grand.Domain/Localization/Language.cs
index 6a59fc5e1..dd7073f49 100644
--- a/src/Core/Grand.Domain/Localization/Language.cs
+++ b/src/Core/Grand.Domain/Localization/Language.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Localization
{
diff --git a/src/Core/Grand.Domain/Logging/ActivityLog.cs b/src/Core/Grand.Domain/Logging/ActivityLog.cs
index 356acff34..65b474288 100644
--- a/src/Core/Grand.Domain/Logging/ActivityLog.cs
+++ b/src/Core/Grand.Domain/Logging/ActivityLog.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Logging
+namespace Grand.Domain.Logging
{
/// <summary>
/// Represents an activity log
diff --git a/src/Core/Grand.Domain/Logging/Log.cs b/src/Core/Grand.Domain/Logging/Log.cs
index d66c8e59d..9820a2e29 100644
--- a/src/Core/Grand.Domain/Logging/Log.cs
+++ b/src/Core/Grand.Domain/Logging/Log.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Logging
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Media/Download.cs b/src/Core/Grand.Domain/Media/Download.cs
index 5ebb1db6c..2fe65fb49 100644
--- a/src/Core/Grand.Domain/Media/Download.cs
+++ b/src/Core/Grand.Domain/Media/Download.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Media
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Media/Picture.cs b/src/Core/Grand.Domain/Media/Picture.cs
index 4fcf60ca3..be67bde1c 100644
--- a/src/Core/Grand.Domain/Media/Picture.cs
+++ b/src/Core/Grand.Domain/Media/Picture.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Media
{
diff --git a/src/Core/Grand.Domain/Messages/Banner.cs b/src/Core/Grand.Domain/Messages/Banner.cs
index 5a072d5b2..2436d92d3 100644
--- a/src/Core/Grand.Domain/Messages/Banner.cs
+++ b/src/Core/Grand.Domain/Messages/Banner.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Localization;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/Campaign.cs b/src/Core/Grand.Domain/Messages/Campaign.cs
index 676cd3033..4ee2c2338 100644
--- a/src/Core/Grand.Domain/Messages/Campaign.cs
+++ b/src/Core/Grand.Domain/Messages/Campaign.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Grand.Domain.Messages
+namespace Grand.Domain.Messages
{
/// <summary>
/// Represents a campaign
diff --git a/src/Core/Grand.Domain/Messages/CampaignHistory.cs b/src/Core/Grand.Domain/Messages/CampaignHistory.cs
index 1245f07cd..ae11ba49d 100644
--- a/src/Core/Grand.Domain/Messages/CampaignHistory.cs
+++ b/src/Core/Grand.Domain/Messages/CampaignHistory.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Messages
+namespace Grand.Domain.Messages
{
/// <summary>
/// Represents a campaign history
diff --git a/src/Core/Grand.Domain/Messages/ContactAttribute.cs b/src/Core/Grand.Domain/Messages/ContactAttribute.cs
index 448f64ad9..daff53101 100644
--- a/src/Core/Grand.Domain/Messages/ContactAttribute.cs
+++ b/src/Core/Grand.Domain/Messages/ContactAttribute.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Common;
using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/ContactAttributeValue.cs b/src/Core/Grand.Domain/Messages/ContactAttributeValue.cs
index 46851b43c..1c78da814 100644
--- a/src/Core/Grand.Domain/Messages/ContactAttributeValue.cs
+++ b/src/Core/Grand.Domain/Messages/ContactAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/ContactUs.cs b/src/Core/Grand.Domain/Messages/ContactUs.cs
index 8708df01f..5f263c02e 100644
--- a/src/Core/Grand.Domain/Messages/ContactUs.cs
+++ b/src/Core/Grand.Domain/Messages/ContactUs.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/InteractiveForm.cs b/src/Core/Grand.Domain/Messages/InteractiveForm.cs
index d72263be2..eae413d30 100644
--- a/src/Core/Grand.Domain/Messages/InteractiveForm.cs
+++ b/src/Core/Grand.Domain/Messages/InteractiveForm.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Localization;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/LiquidObject.cs b/src/Core/Grand.Domain/Messages/LiquidObject.cs
index 3abf7aa64..283e89262 100644
--- a/src/Core/Grand.Domain/Messages/LiquidObject.cs
+++ b/src/Core/Grand.Domain/Messages/LiquidObject.cs
@@ -1,5 +1,4 @@
using DotLiquid;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/MessageDelayPeriod.cs b/src/Core/Grand.Domain/Messages/MessageDelayPeriod.cs
index c4558abbd..9b8d7cb3a 100644
--- a/src/Core/Grand.Domain/Messages/MessageDelayPeriod.cs
+++ b/src/Core/Grand.Domain/Messages/MessageDelayPeriod.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Messages
+namespace Grand.Domain.Messages
{
public enum MessageDelayPeriod
{
diff --git a/src/Core/Grand.Domain/Messages/MessageTemplate.cs b/src/Core/Grand.Domain/Messages/MessageTemplate.cs
index 56f71cc82..99a4fe07d 100644
--- a/src/Core/Grand.Domain/Messages/MessageTemplate.cs
+++ b/src/Core/Grand.Domain/Messages/MessageTemplate.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/NewsLetterSubscription.cs b/src/Core/Grand.Domain/Messages/NewsLetterSubscription.cs
index 21949e0bf..a254652bd 100644
--- a/src/Core/Grand.Domain/Messages/NewsLetterSubscription.cs
+++ b/src/Core/Grand.Domain/Messages/NewsLetterSubscription.cs
@@ -1,6 +1,4 @@
using Grand.Domain.History;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/NewsletterCategory.cs b/src/Core/Grand.Domain/Messages/NewsletterCategory.cs
index 120443bf3..a66aa932f 100644
--- a/src/Core/Grand.Domain/Messages/NewsletterCategory.cs
+++ b/src/Core/Grand.Domain/Messages/NewsletterCategory.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/Messages/PopupActive.cs b/src/Core/Grand.Domain/Messages/PopupActive.cs
index a73935b55..0b3095d18 100644
--- a/src/Core/Grand.Domain/Messages/PopupActive.cs
+++ b/src/Core/Grand.Domain/Messages/PopupActive.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Messages
+namespace Grand.Domain.Messages
{
public partial class PopupActive : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Messages/PopupArchive.cs b/src/Core/Grand.Domain/Messages/PopupArchive.cs
index fd9f653c9..73629ad21 100644
--- a/src/Core/Grand.Domain/Messages/PopupArchive.cs
+++ b/src/Core/Grand.Domain/Messages/PopupArchive.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Messages
+namespace Grand.Domain.Messages
{
public partial class PopupArchive : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Messages/QueuedEmail.cs b/src/Core/Grand.Domain/Messages/QueuedEmail.cs
index 8b97b6c0e..9d7206494 100644
--- a/src/Core/Grand.Domain/Messages/QueuedEmail.cs
+++ b/src/Core/Grand.Domain/Messages/QueuedEmail.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Messages
{
diff --git a/src/Core/Grand.Domain/News/NewsComment.cs b/src/Core/Grand.Domain/News/NewsComment.cs
index 9ac8bd5da..cc6b49220 100644
--- a/src/Core/Grand.Domain/News/NewsComment.cs
+++ b/src/Core/Grand.Domain/News/NewsComment.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.News
{
/// <summary>
diff --git a/src/Core/Grand.Domain/News/NewsItem.cs b/src/Core/Grand.Domain/News/NewsItem.cs
index 127e2612d..af00b7f21 100644
--- a/src/Core/Grand.Domain/News/NewsItem.cs
+++ b/src/Core/Grand.Domain/News/NewsItem.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.News
{
diff --git a/src/Core/Grand.Domain/Orders/CheckoutAttribute.cs b/src/Core/Grand.Domain/Orders/CheckoutAttribute.cs
index 2b97a4165..dc784f24e 100644
--- a/src/Core/Grand.Domain/Orders/CheckoutAttribute.cs
+++ b/src/Core/Grand.Domain/Orders/CheckoutAttribute.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Common;
using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/CheckoutAttributeValue.cs b/src/Core/Grand.Domain/Orders/CheckoutAttributeValue.cs
index 4b1dc6886..d8747cd99 100644
--- a/src/Core/Grand.Domain/Orders/CheckoutAttributeValue.cs
+++ b/src/Core/Grand.Domain/Orders/CheckoutAttributeValue.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/GiftVoucher.cs b/src/Core/Grand.Domain/Orders/GiftVoucher.cs
index a76e46357..fbf576166 100644
--- a/src/Core/Grand.Domain/Orders/GiftVoucher.cs
+++ b/src/Core/Grand.Domain/Orders/GiftVoucher.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Catalog;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/GiftVoucherUsageHistory.cs b/src/Core/Grand.Domain/Orders/GiftVoucherUsageHistory.cs
index 3ab6d6201..b0a7b9a97 100644
--- a/src/Core/Grand.Domain/Orders/GiftVoucherUsageHistory.cs
+++ b/src/Core/Grand.Domain/Orders/GiftVoucherUsageHistory.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Orders
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Orders/LoyaltyPointsHistory.cs b/src/Core/Grand.Domain/Orders/LoyaltyPointsHistory.cs
index 14af29629..6cb8dd16c 100644
--- a/src/Core/Grand.Domain/Orders/LoyaltyPointsHistory.cs
+++ b/src/Core/Grand.Domain/Orders/LoyaltyPointsHistory.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Orders
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturn.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturn.cs
index d7b386c1c..80edd6569 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturn.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturn.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
index 4f6ad381c..70da0450a 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturnNote.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Orders
+namespace Grand.Domain.Orders
{
/// <summary>
/// Represents a merchandise return note
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
index ac266646c..bba92dd7a 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/Order.cs b/src/Core/Grand.Domain/Orders/Order.cs
index 1b2b67caa..506dba878 100644
--- a/src/Core/Grand.Domain/Orders/Order.cs
+++ b/src/Core/Grand.Domain/Orders/Order.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Common;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Domain.Tax;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/OrderItem.cs b/src/Core/Grand.Domain/Orders/OrderItem.cs
index 0f7fbc3e3..dc4f6df4c 100644
--- a/src/Core/Grand.Domain/Orders/OrderItem.cs
+++ b/src/Core/Grand.Domain/Orders/OrderItem.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/Orders/OrderNote.cs b/src/Core/Grand.Domain/Orders/OrderNote.cs
index cc6442e54..304ee365d 100644
--- a/src/Core/Grand.Domain/Orders/OrderNote.cs
+++ b/src/Core/Grand.Domain/Orders/OrderNote.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Orders
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs b/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
index adc53ff3a..f4f1c386d 100644
--- a/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
+++ b/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Orders
{
diff --git a/src/Core/Grand.Domain/PagedList.cs b/src/Core/Grand.Domain/PagedList.cs
index 6dda29072..e4e6768ea 100644
--- a/src/Core/Grand.Domain/PagedList.cs
+++ b/src/Core/Grand.Domain/PagedList.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Grand.Domain
+namespace Grand.Domain
{
/// <summary>
/// Paged list
diff --git a/src/Core/Grand.Domain/Pages/Page.cs b/src/Core/Grand.Domain/Pages/Page.cs
index 865afaf8c..fa4c78073 100644
--- a/src/Core/Grand.Domain/Pages/Page.cs
+++ b/src/Core/Grand.Domain/Pages/Page.cs
@@ -2,8 +2,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Permissions;
using Grand.Domain.Seo;
using Grand.Domain.Stores;
-using System;
-using System.Collections.Generic;
namespace Grand.Domain.Pages
{
diff --git a/src/Core/Grand.Domain/Payments/PaymentRestictedSettings.cs b/src/Core/Grand.Domain/Payments/PaymentRestictedSettings.cs
index 08a47a4b2..aad34da45 100644
--- a/src/Core/Grand.Domain/Payments/PaymentRestictedSettings.cs
+++ b/src/Core/Grand.Domain/Payments/PaymentRestictedSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Payments
{
diff --git a/src/Core/Grand.Domain/Payments/PaymentSettings.cs b/src/Core/Grand.Domain/Payments/PaymentSettings.cs
index 4e9bcb0be..d3c99a5c9 100644
--- a/src/Core/Grand.Domain/Payments/PaymentSettings.cs
+++ b/src/Core/Grand.Domain/Payments/PaymentSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Payments
{
diff --git a/src/Core/Grand.Domain/Payments/PaymentTransaction.cs b/src/Core/Grand.Domain/Payments/PaymentTransaction.cs
index 4cbf9c1d1..60c5a5644 100644
--- a/src/Core/Grand.Domain/Payments/PaymentTransaction.cs
+++ b/src/Core/Grand.Domain/Payments/PaymentTransaction.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Grand.Domain.Payments
+namespace Grand.Domain.Payments
{
public class PaymentTransaction : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Permissions/DefaultPermission.cs b/src/Core/Grand.Domain/Permissions/DefaultPermission.cs
index c4ba48919..8bc5a3cc3 100644
--- a/src/Core/Grand.Domain/Permissions/DefaultPermission.cs
+++ b/src/Core/Grand.Domain/Permissions/DefaultPermission.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain.Permissions
+namespace Grand.Domain.Permissions
{
/// <summary>
/// Represents a default permission
diff --git a/src/Core/Grand.Domain/Permissions/IGroupLinkEntity.cs b/src/Core/Grand.Domain/Permissions/IGroupLinkEntity.cs
index bf583dcec..9e3ab0529 100644
--- a/src/Core/Grand.Domain/Permissions/IGroupLinkEntity.cs
+++ b/src/Core/Grand.Domain/Permissions/IGroupLinkEntity.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace Grand.Domain.Permissions
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Permissions/Permission.cs b/src/Core/Grand.Domain/Permissions/Permission.cs
index 94a539d9f..77653413b 100644
--- a/src/Core/Grand.Domain/Permissions/Permission.cs
+++ b/src/Core/Grand.Domain/Permissions/Permission.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Domain.Permissions
+namespace Grand.Domain.Permissions
{
/// <summary>
/// Represents a permission
diff --git a/src/Core/Grand.Domain/PushNotifications/PushMessage.cs b/src/Core/Grand.Domain/PushNotifications/PushMessage.cs
index 479237b11..ae7f24e0a 100644
--- a/src/Core/Grand.Domain/PushNotifications/PushMessage.cs
+++ b/src/Core/Grand.Domain/PushNotifications/PushMessage.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.PushNotifications
+namespace Grand.Domain.PushNotifications
{
public class PushMessage : BaseEntity
{
diff --git a/src/Core/Grand.Domain/PushNotifications/PushRegistration.cs b/src/Core/Grand.Domain/PushNotifications/PushRegistration.cs
index 2f65ca27b..897f1d75a 100644
--- a/src/Core/Grand.Domain/PushNotifications/PushRegistration.cs
+++ b/src/Core/Grand.Domain/PushNotifications/PushRegistration.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.PushNotifications
+namespace Grand.Domain.PushNotifications
{
public class PushRegistration : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Security/RefreshToken.cs b/src/Core/Grand.Domain/Security/RefreshToken.cs
index 8446753bb..356814b89 100644
--- a/src/Core/Grand.Domain/Security/RefreshToken.cs
+++ b/src/Core/Grand.Domain/Security/RefreshToken.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Security
+namespace Grand.Domain.Security
{
public class RefreshToken
{
diff --git a/src/Core/Grand.Domain/Security/SecuritySettings.cs b/src/Core/Grand.Domain/Security/SecuritySettings.cs
index 922abd51d..17987e82e 100644
--- a/src/Core/Grand.Domain/Security/SecuritySettings.cs
+++ b/src/Core/Grand.Domain/Security/SecuritySettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Security
{
diff --git a/src/Core/Grand.Domain/Seo/SeoSettings.cs b/src/Core/Grand.Domain/Seo/SeoSettings.cs
index 0ec11bf06..ef74a532e 100644
--- a/src/Core/Grand.Domain/Seo/SeoSettings.cs
+++ b/src/Core/Grand.Domain/Seo/SeoSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Seo
{
diff --git a/src/Core/Grand.Domain/Shipping/DeliveryDate.cs b/src/Core/Grand.Domain/Shipping/DeliveryDate.cs
index e1d23aada..596f891fb 100644
--- a/src/Core/Grand.Domain/Shipping/DeliveryDate.cs
+++ b/src/Core/Grand.Domain/Shipping/DeliveryDate.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Shipping
{
diff --git a/src/Core/Grand.Domain/Shipping/Shipment.cs b/src/Core/Grand.Domain/Shipping/Shipment.cs
index 3d7ef0898..86e9b77a9 100644
--- a/src/Core/Grand.Domain/Shipping/Shipment.cs
+++ b/src/Core/Grand.Domain/Shipping/Shipment.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace Grand.Domain.Shipping
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Shipping/ShipmentItem.cs b/src/Core/Grand.Domain/Shipping/ShipmentItem.cs
index 40666a628..4af0f7035 100644
--- a/src/Core/Grand.Domain/Shipping/ShipmentItem.cs
+++ b/src/Core/Grand.Domain/Shipping/ShipmentItem.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Common;
-using System.Collections.Generic;
namespace Grand.Domain.Shipping
{
diff --git a/src/Core/Grand.Domain/Shipping/ShipmentNote.cs b/src/Core/Grand.Domain/Shipping/ShipmentNote.cs
index b86a0cd9f..470bbb045 100644
--- a/src/Core/Grand.Domain/Shipping/ShipmentNote.cs
+++ b/src/Core/Grand.Domain/Shipping/ShipmentNote.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace Grand.Domain.Shipping
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Shipping/ShippingMethod.cs b/src/Core/Grand.Domain/Shipping/ShippingMethod.cs
index b2a319423..4fa149e31 100644
--- a/src/Core/Grand.Domain/Shipping/ShippingMethod.cs
+++ b/src/Core/Grand.Domain/Shipping/ShippingMethod.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Directory;
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Shipping
{
diff --git a/src/Core/Grand.Domain/Shipping/ShippingProviderSettings.cs b/src/Core/Grand.Domain/Shipping/ShippingProviderSettings.cs
index a069693ce..c55cd5e22 100644
--- a/src/Core/Grand.Domain/Shipping/ShippingProviderSettings.cs
+++ b/src/Core/Grand.Domain/Shipping/ShippingProviderSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Grand.Domain.Shipping
{
diff --git a/src/Core/Grand.Domain/Stores/IStoreLinkEntity.cs b/src/Core/Grand.Domain/Stores/IStoreLinkEntity.cs
index 74dd6693b..3fe882833 100644
--- a/src/Core/Grand.Domain/Stores/IStoreLinkEntity.cs
+++ b/src/Core/Grand.Domain/Stores/IStoreLinkEntity.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace Grand.Domain.Stores
{
/// <summary>
diff --git a/src/Core/Grand.Domain/Stores/Store.cs b/src/Core/Grand.Domain/Stores/Store.cs
index 7c92cdf22..f08037f0e 100644
--- a/src/Core/Grand.Domain/Stores/Store.cs
+++ b/src/Core/Grand.Domain/Stores/Store.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Localization;
-using System.Collections.Generic;
namespace Grand.Domain.Stores
{
diff --git a/src/Core/Grand.Domain/Stores/StoreExtensions.cs b/src/Core/Grand.Domain/Stores/StoreExtensions.cs
index ad970e478..c22ca2bb1 100644
--- a/src/Core/Grand.Domain/Stores/StoreExtensions.cs
+++ b/src/Core/Grand.Domain/Stores/StoreExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-
-namespace Grand.Domain.Stores
+namespace Grand.Domain.Stores
{
public static class StoreExtensions
{
diff --git a/src/Core/Grand.Domain/Tasks/ScheduleTask.cs b/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
index 726c23234..89d7e10df 100644
--- a/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
+++ b/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Tasks
+namespace Grand.Domain.Tasks
{
public partial class ScheduleTask : BaseEntity
{
diff --git a/src/Core/Grand.Domain/Tax/TaxSettings.cs b/src/Core/Grand.Domain/Tax/TaxSettings.cs
index 1b0585d35..6b8660d8e 100644
--- a/src/Core/Grand.Domain/Tax/TaxSettings.cs
+++ b/src/Core/Grand.Domain/Tax/TaxSettings.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using Grand.Domain.Configuration;
-using System;
namespace Grand.Domain.Tax
{
diff --git a/src/Core/Grand.Domain/Vendors/Vendor.cs b/src/Core/Grand.Domain/Vendors/Vendor.cs
index f60c3971d..55ffbb98d 100644
--- a/src/Core/Grand.Domain/Vendors/Vendor.cs
+++ b/src/Core/Grand.Domain/Vendors/Vendor.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Common;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
-using System.Collections.Generic;
namespace Grand.Domain.Vendors
{
diff --git a/src/Core/Grand.Domain/Vendors/VendorNote.cs b/src/Core/Grand.Domain/Vendors/VendorNote.cs
index 74fd4bf2c..cb55e3258 100644
--- a/src/Core/Grand.Domain/Vendors/VendorNote.cs
+++ b/src/Core/Grand.Domain/Vendors/VendorNote.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Domain.Vendors
+namespace Grand.Domain.Vendors
{
/// <summary>
/// Represents a vendor note
diff --git a/src/Core/Grand.Domain/Vendors/VendorReview.cs b/src/Core/Grand.Domain/Vendors/VendorReview.cs
index b55ba9063..92041eea9 100644
--- a/src/Core/Grand.Domain/Vendors/VendorReview.cs
+++ b/src/Core/Grand.Domain/Vendors/VendorReview.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Grand.Domain.Vendors
+namespace Grand.Domain.Vendors
{
/// <summary>
/// Represents a vendor review
diff --git a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs b/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
index dac297b89..466150482 100644
--- a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
+++ b/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading.Tasks;
-
namespace Grand.Infrastructure.Caching
{
/// <summary>
diff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
index ead9514f2..fbbebdc12 100644
--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
+++ b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs
@@ -3,10 +3,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Primitives;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Caching
{
diff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs
index ee9e32c81..6c757f5a7 100644
--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs
@@ -1,8 +1,5 @@
using Microsoft.Extensions.Caching.Memory;
-using System;
using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
namespace Grand.Infrastructure.Caching
diff --git a/src/Core/Grand.Infrastructure/Caching/Message/IMessageBus.cs b/src/Core/Grand.Infrastructure/Caching/Message/IMessageBus.cs
index 4b15b48d8..d1a3867e6 100644
--- a/src/Core/Grand.Infrastructure/Caching/Message/IMessageBus.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Message/IMessageBus.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Caching.Message
+namespace Grand.Infrastructure.Caching.Message
{
public interface IMessageBus : IMessagePublisher, IMessageSubscriber
{
diff --git a/src/Core/Grand.Infrastructure/Caching/Message/IMessagePublisher.cs b/src/Core/Grand.Infrastructure/Caching/Message/IMessagePublisher.cs
index 733500b02..e7ca93e5e 100644
--- a/src/Core/Grand.Infrastructure/Caching/Message/IMessagePublisher.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Message/IMessagePublisher.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Caching.Message
+namespace Grand.Infrastructure.Caching.Message
{
public interface IMessagePublisher
{
diff --git a/src/Core/Grand.Infrastructure/Caching/Message/IMessageSubscriber.cs b/src/Core/Grand.Infrastructure/Caching/Message/IMessageSubscriber.cs
index b6dc14188..c5f769f05 100644
--- a/src/Core/Grand.Infrastructure/Caching/Message/IMessageSubscriber.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Message/IMessageSubscriber.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Caching.Message
+namespace Grand.Infrastructure.Caching.Message
{
public interface IMessageSubscriber
{
diff --git a/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs b/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs
index 4132a9795..6970085f8 100644
--- a/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs
+++ b/src/Core/Grand.Infrastructure/Caching/RabbitMq/CacheMessageEventConsumer.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Caching.Message;
using MassTransit;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Caching.RabbitMq
{
diff --git a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs
index 706d7e517..9c1167cbe 100644
--- a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs
+++ b/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs
@@ -2,9 +2,6 @@
using MassTransit;
using MediatR;
using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Caching.RabbitMq
{
diff --git a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageBus.cs b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageBus.cs
index bdf6d01f2..55d43ec64 100644
--- a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageBus.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageBus.cs
@@ -1,7 +1,5 @@
using Newtonsoft.Json;
using StackExchange.Redis;
-using System;
-using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Grand.Infrastructure.Caching.Message;
using Grand.Infrastructure.Configuration;
diff --git a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
index 32ef468da..6539a6eaa 100644
--- a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs
@@ -1,9 +1,6 @@
using Grand.Infrastructure.Caching.Message;
using MediatR;
using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Caching.Redis
{
diff --git a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
index 701fb1a5c..f79b11b20 100644
--- a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace Grand.Infrastructure.Configuration
{
/// <summary>
diff --git a/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs b/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
index ed131998b..57c8d7252 100644
--- a/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
@@ -1,8 +1,5 @@
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.WebUtilities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Infrastructure.Extensions
{
diff --git a/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs b/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
index 9b4235fa7..4d4a1b5bd 100644
--- a/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Extensions/EventPublisherExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.Events;
using Grand.Domain;
using MediatR;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Extensions
{
diff --git a/src/Core/Grand.Infrastructure/Extensions/ProviderExtensions.cs b/src/Core/Grand.Infrastructure/Extensions/ProviderExtensions.cs
index c16f5e12c..6b03d8dd7 100644
--- a/src/Core/Grand.Infrastructure/Extensions/ProviderExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Extensions/ProviderExtensions.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Stores;
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
-using System;
-using System.Linq;
namespace Grand.Infrastructure.Extensions
{
diff --git a/src/Core/Grand.Infrastructure/IStoreHelper.cs b/src/Core/Grand.Infrastructure/IStoreHelper.cs
index 077d296e4..a8db766d9 100644
--- a/src/Core/Grand.Infrastructure/IStoreHelper.cs
+++ b/src/Core/Grand.Infrastructure/IStoreHelper.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Stores;
-using System.Threading.Tasks;
namespace Grand.Infrastructure
{
diff --git a/src/Core/Grand.Infrastructure/IWorkContext.cs b/src/Core/Grand.Infrastructure/IWorkContext.cs
index 35d8af0f4..d95472a68 100644
--- a/src/Core/Grand.Infrastructure/IWorkContext.cs
+++ b/src/Core/Grand.Infrastructure/IWorkContext.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Domain.Vendors;
-using System.Threading.Tasks;
namespace Grand.Infrastructure
{
diff --git a/src/Core/Grand.Infrastructure/Migrations/DbVersion.cs b/src/Core/Grand.Infrastructure/Migrations/DbVersion.cs
index e9b939f3d..45a24e01e 100644
--- a/src/Core/Grand.Infrastructure/Migrations/DbVersion.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/DbVersion.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Infrastructure.Migrations
+namespace Grand.Infrastructure.Migrations
{
public class DbVersion: IComparable<DbVersion>
{
diff --git a/src/Core/Grand.Infrastructure/Migrations/IBaseMigration.cs b/src/Core/Grand.Infrastructure/Migrations/IBaseMigration.cs
index 9516b11e7..c9b253aed 100644
--- a/src/Core/Grand.Infrastructure/Migrations/IBaseMigration.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/IBaseMigration.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Infrastructure.Migrations
+namespace Grand.Infrastructure.Migrations
{
public interface IBaseMigration
{
diff --git a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs b/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
index 0576c12f1..1541b2403 100644
--- a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Data;
-using System;
namespace Grand.Infrastructure.Migrations
{
diff --git a/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs b/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
index 49db305ce..94c63b3cf 100644
--- a/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
@@ -1,8 +1,5 @@
using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearchers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Infrastructure.Migrations
{
diff --git a/src/Core/Grand.Infrastructure/Models/BaseModel.cs b/src/Core/Grand.Infrastructure/Models/BaseModel.cs
index e6da9769f..34a92d934 100644
--- a/src/Core/Grand.Infrastructure/Models/BaseModel.cs
+++ b/src/Core/Grand.Infrastructure/Models/BaseModel.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Common;
using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System.Collections.Generic;
namespace Grand.Infrastructure.Models
{
diff --git a/src/Core/Grand.Infrastructure/Plugins/BasePlugin.cs b/src/Core/Grand.Infrastructure/Plugins/BasePlugin.cs
index 6d05a57a1..3a8314447 100644
--- a/src/Core/Grand.Infrastructure/Plugins/BasePlugin.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/BasePlugin.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Plugins
+namespace Grand.Infrastructure.Plugins
{
public abstract class BasePlugin : IPlugin
{
diff --git a/src/Core/Grand.Infrastructure/Plugins/IPlugin.cs b/src/Core/Grand.Infrastructure/Plugins/IPlugin.cs
index eb7a918c3..b8ee08a68 100644
--- a/src/Core/Grand.Infrastructure/Plugins/IPlugin.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/IPlugin.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace Grand.Infrastructure.Plugins
+namespace Grand.Infrastructure.Plugins
{
/// <summary>
/// Interface for Plugin
diff --git a/src/Core/Grand.Infrastructure/Plugins/IProvider.cs b/src/Core/Grand.Infrastructure/Plugins/IProvider.cs
index 89ae86343..7edfc74ea 100644
--- a/src/Core/Grand.Infrastructure/Plugins/IProvider.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/IProvider.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Infrastructure.Plugins
+namespace Grand.Infrastructure.Plugins
{
public interface IProvider
{
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs b/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
index 018b6ea84..868c2e8a9 100644
--- a/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
@@ -1,10 +1,5 @@
using Grand.SharedKernel.Extensions;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Grand.Infrastructure.Plugins
{
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginInfo.cs b/src/Core/Grand.Infrastructure/Plugins/PluginInfo.cs
index 521090cdf..2c235057c 100644
--- a/src/Core/Grand.Infrastructure/Plugins/PluginInfo.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/PluginInfo.cs
@@ -1,7 +1,5 @@
using Grand.SharedKernel;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.IO;
using System.Reflection;
namespace Grand.Infrastructure.Plugins
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginInfoAttribute.cs b/src/Core/Grand.Infrastructure/Plugins/PluginInfoAttribute.cs
index 5a920fd38..94b6ebc70 100644
--- a/src/Core/Grand.Infrastructure/Plugins/PluginInfoAttribute.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/PluginInfoAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Infrastructure.Plugins
+namespace Grand.Infrastructure.Plugins
{
[AttributeUsage(AttributeTargets.Assembly)]
public class PluginInfoAttribute : Attribute
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs b/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs
index cade2beb5..c56a1eadc 100644
--- a/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/PluginManager.cs
@@ -3,10 +3,6 @@ using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.Loader;
diff --git a/src/Core/Grand.Infrastructure/Roslyn/ResultCompiler.cs b/src/Core/Grand.Infrastructure/Roslyn/ResultCompiler.cs
index aeed56ab0..8c6501ddc 100644
--- a/src/Core/Grand.Infrastructure/Roslyn/ResultCompiler.cs
+++ b/src/Core/Grand.Infrastructure/Roslyn/ResultCompiler.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
namespace Grand.Infrastructure.Roslyn
{
diff --git a/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs b/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs
index d03d8993e..8a233a6cb 100644
--- a/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs
+++ b/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs
@@ -4,11 +4,8 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Scripting;
using Microsoft.CodeAnalysis.Scripting;
-using System;
-using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
-using System.IO;
using System.Reflection;
using System.Runtime.Loader;
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
index 3e19b64c5..6955cb224 100644
--- a/src/Core/Grand.Infrastructure/StartupBase.cs
+++ b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -17,8 +17,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
using Wkhtmltopdf.NetCore;
namespace Grand.Infrastructure
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/BoolTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/BoolTypeConverter.cs
index 3dd45b7ea..6d4d9d7b4 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/BoolTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/BoolTypeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
using System.Globalization;
namespace Grand.Infrastructure.TypeConverters.Converter
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/CustomAttributeListTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/CustomAttributeListTypeConverter.cs
index e47f7a899..3e5c46ad9 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/CustomAttributeListTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/CustomAttributeListTypeConverter.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Common;
-using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Text.Json;
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericDictionaryTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericDictionaryTypeConverter.cs
index 35e9e6629..cd26eeaec 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericDictionaryTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericDictionaryTypeConverter.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
using System.Globalization;
-using System.Linq;
namespace Grand.Infrastructure.TypeConverters.Converter
{
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericListTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericListTypeConverter.cs
index f51c2e3c7..35314d5c6 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericListTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/GenericListTypeConverter.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
using System.Globalization;
-using System.Linq;
namespace Grand.Infrastructure.TypeConverters.Converter
{
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
index 6512927f2..c0186eccf 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/RefreshTokenTypeConverter.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Security;
-using System;
using System.ComponentModel;
using System.Globalization;
using System.Text.Json;
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionListTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionListTypeConverter.cs
index 213a20c19..df515c0c1 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionListTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionListTypeConverter.cs
@@ -1,6 +1,4 @@
using Grand.Domain.Shipping;
-using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Text.Json;
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionTypeConverter.cs
index 5680d5383..163511f99 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/Converter/ShippingOptionTypeConverter.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Shipping;
-using System;
using System.ComponentModel;
using System.Globalization;
using System.Text.Json;
diff --git a/src/Core/Grand.Infrastructure/TypeConverters/WebTypeConverter.cs b/src/Core/Grand.Infrastructure/TypeConverters/WebTypeConverter.cs
index 05685f03c..2636e6750 100644
--- a/src/Core/Grand.Infrastructure/TypeConverters/WebTypeConverter.cs
+++ b/src/Core/Grand.Infrastructure/TypeConverters/WebTypeConverter.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.TypeConverters.Converter;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
-using System.Collections.Generic;
using System.ComponentModel;
using Grand.Domain.Security;
diff --git a/src/Core/Grand.Infrastructure/TypeSearcher/AppTypeSearcher.cs b/src/Core/Grand.Infrastructure/TypeSearcher/AppTypeSearcher.cs
index 9143a3117..e9e8ac7b7 100644
--- a/src/Core/Grand.Infrastructure/TypeSearcher/AppTypeSearcher.cs
+++ b/src/Core/Grand.Infrastructure/TypeSearcher/AppTypeSearcher.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
namespace Grand.Infrastructure.TypeSearchers
{
diff --git a/src/Core/Grand.Infrastructure/TypeSearcher/ITypeSearcher.cs b/src/Core/Grand.Infrastructure/TypeSearcher/ITypeSearcher.cs
index c107df921..dfb3ed027 100644
--- a/src/Core/Grand.Infrastructure/TypeSearcher/ITypeSearcher.cs
+++ b/src/Core/Grand.Infrastructure/TypeSearcher/ITypeSearcher.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
namespace Grand.Infrastructure.TypeSearchers
{
diff --git a/src/Core/Grand.Infrastructure/TypeSearcher/TypeSearcher.cs b/src/Core/Grand.Infrastructure/TypeSearcher/TypeSearcher.cs
index 379fe15df..740a30f2a 100644
--- a/src/Core/Grand.Infrastructure/TypeSearcher/TypeSearcher.cs
+++ b/src/Core/Grand.Infrastructure/TypeSearcher/TypeSearcher.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
+using System.Diagnostics;
using System.Reflection;
namespace Grand.Infrastructure.TypeSearchers
diff --git a/src/Core/Grand.Infrastructure/Validators/BaseGrandValidator.cs b/src/Core/Grand.Infrastructure/Validators/BaseGrandValidator.cs
index 661068c30..31eaaae13 100644
--- a/src/Core/Grand.Infrastructure/Validators/BaseGrandValidator.cs
+++ b/src/Core/Grand.Infrastructure/Validators/BaseGrandValidator.cs
@@ -1,5 +1,4 @@
using FluentValidation;
-using System.Collections.Generic;
namespace Grand.Infrastructure.Validators
{
diff --git a/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
index e71996234..c0ae4712f 100644
--- a/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
+++ b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
@@ -7,7 +7,6 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Authentication.Facebook.Controllers
{
diff --git a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
index 56809bf3a..9b57de8c9 100644
--- a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
+++ b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
@@ -6,9 +6,7 @@ using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Facebook;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Authentication.Facebook.Controllers
{
diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs b/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
index a1cac9f2d..9b05a9e87 100644
--- a/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
+++ b/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
@@ -2,7 +2,6 @@ using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Authentication.Facebook
{
diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs b/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
index d57b3eaf1..46e9d1abc 100644
--- a/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
+++ b/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
@@ -1,6 +1,4 @@
using Grand.Business.Authentication.Interfaces;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Authentication.Facebook
{
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
index 2e0879e67..acc2c2991 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
@@ -4,10 +4,7 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
-using System.Linq;
using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
namespace Authentication.Facebook.Infrastructure.Cache
{
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
index ffa364d3a..be7357e5b 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
@@ -8,11 +8,8 @@ using Microsoft.AspNetCore.Authentication.OAuth;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
-using System;
-using System.Linq;
using System.Net;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Authentication.Facebook.Infrastructure
{
diff --git a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
index 297579922..858255523 100644
--- a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
+++ b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
@@ -7,7 +7,6 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Authentication.Google.Controllers
{
diff --git a/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs b/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
index f99f664cf..e6f516dad 100644
--- a/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
+++ b/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
@@ -6,9 +6,7 @@ using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Google;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Authentication.Google.Controllers
{
diff --git a/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs b/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
index d99852cf6..4434fdbee 100644
--- a/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
+++ b/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
@@ -2,7 +2,6 @@ using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Authentication.Google
{
diff --git a/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs b/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
index fc64f1df7..26615cd3d 100644
--- a/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
+++ b/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
@@ -1,6 +1,4 @@
using Grand.Business.Authentication.Interfaces;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Authentication.Google
{
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
index 7ef598eab..40b1703f7 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
@@ -8,11 +8,8 @@ using Microsoft.AspNetCore.Authentication.OAuth;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
-using System;
-using System.Linq;
using System.Net;
using System.Text.Json;
-using System.Threading.Tasks;
namespace Authentication.Google.Infrastructure
{
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
index 3054bd736..506769f67 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
@@ -4,10 +4,7 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
-using System.Linq;
using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
namespace Authentication.Google.Infrastructure.Cache
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
index acbb3e4fc..4f4ace08c 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
@@ -10,9 +10,6 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.CustomerGroups.Controllers
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
index 5d42e0ce1..bc1216a89 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
@@ -6,9 +6,6 @@ using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Domain.Discounts;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using DiscountRules.Standard.HadSpentAmount.Models;
using DiscountRules.Standard.Models;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
index ee18c0dc3..781326dea 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
@@ -17,10 +17,6 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.HasAllProducts.Controllers
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index 019d795a5..81a551caf 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -17,10 +17,6 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.HasOneProduct.Controllers
{
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
index 314167379..66b1c9917 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
@@ -8,9 +8,6 @@ using Grand.Web.Common.Filters;
using Grand.Domain.Discounts;
using Grand.Plugin.DiscountRules.ShoppingCart.Models;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Standard.Controllers
{
diff --git a/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs b/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
index 70f782064..1a376b929 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
+++ b/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace DiscountRules.Standard
{
diff --git a/src/Plugins/DiscountRules.Standard/DiscountProvider.cs b/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
index 40ff85b8d..ddef0452b 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
+++ b/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
@@ -1,6 +1,5 @@
using DiscountRules.Provider;
using Grand.Business.Catalog.Interfaces.Discounts;
-using System.Collections.Generic;
namespace DiscountRules.Standard
{
diff --git a/src/Plugins/DiscountRules.Standard/Models/RequirementModel.cs b/src/Plugins/DiscountRules.Standard/Models/RequirementModel.cs
index 612db0dab..b96193750 100644
--- a/src/Plugins/DiscountRules.Standard/Models/RequirementModel.cs
+++ b/src/Plugins/DiscountRules.Standard/Models/RequirementModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace DiscountRules.CustomerGroups.Models
diff --git a/src/Plugins/DiscountRules.Standard/Models/RequirementProducts.cs b/src/Plugins/DiscountRules.Standard/Models/RequirementProducts.cs
index 3423b7b83..87da2170b 100644
--- a/src/Plugins/DiscountRules.Standard/Models/RequirementProducts.cs
+++ b/src/Plugins/DiscountRules.Standard/Models/RequirementProducts.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace DiscountRules.Standard.Models
+namespace DiscountRules.Standard.Models
{
public class RequirementProducts
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
index 6c6c98d97..56c6d8e74 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
@@ -2,9 +2,6 @@ using DiscountRules.Standard.Models;
using Grand.Business.Catalog.Interfaces.Discounts;
using Grand.Business.Catalog.Utilities;
using Grand.Business.Common.Interfaces.Configuration;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
index 86ca8ff7d..82735e95c 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
@@ -5,9 +5,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Domain.Orders;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
index d353dd548..528aaf6df 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
@@ -4,9 +4,6 @@ using Grand.Business.Catalog.Utilities;
using Grand.Business.Checkout.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Domain.Orders;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
index c73c82d4c..2ae3b9598 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
@@ -4,9 +4,6 @@ using Grand.Business.Catalog.Utilities;
using Grand.Business.Checkout.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Domain.Orders;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
index 81cf29612..6be83f532 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
@@ -8,9 +8,6 @@ using Grand.Business.Common.Interfaces.Configuration;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/ExchangeRate.McExchange/EcbExchange.cs b/src/Plugins/ExchangeRate.McExchange/EcbExchange.cs
index 00bd3040d..5fc2d2f7c 100644
--- a/src/Plugins/ExchangeRate.McExchange/EcbExchange.cs
+++ b/src/Plugins/ExchangeRate.McExchange/EcbExchange.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Net;
using System.Net.Http;
-using System.Threading.Tasks;
using System.Xml;
namespace ExchangeRate.McExchange
diff --git a/src/Plugins/ExchangeRate.McExchange/IRateProvider.cs b/src/Plugins/ExchangeRate.McExchange/IRateProvider.cs
index f7a9170f2..20c15c720 100644
--- a/src/Plugins/ExchangeRate.McExchange/IRateProvider.cs
+++ b/src/Plugins/ExchangeRate.McExchange/IRateProvider.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
namespace ExchangeRate.McExchange
{
internal interface IRateProvider
diff --git a/src/Plugins/ExchangeRate.McExchange/McExchangeRatePlugin.cs b/src/Plugins/ExchangeRate.McExchange/McExchangeRatePlugin.cs
index f03f98fbb..4d6c6811d 100644
--- a/src/Plugins/ExchangeRate.McExchange/McExchangeRatePlugin.cs
+++ b/src/Plugins/ExchangeRate.McExchange/McExchangeRatePlugin.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Plugins;
using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
[assembly: InternalsVisibleTo("Grand.Plugin.Tests")]
diff --git a/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs b/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
index ebb027717..d4b8da6e2 100644
--- a/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
+++ b/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Providers;
using Grand.SharedKernel;
-using System;
-using System.Collections.Generic;
using System.Net.Http;
-using System.Threading.Tasks;
namespace ExchangeRate.McExchange
{
diff --git a/src/Plugins/ExchangeRate.McExchange/NbpExchange.cs b/src/Plugins/ExchangeRate.McExchange/NbpExchange.cs
index b7f344d80..e2543a0bf 100644
--- a/src/Plugins/ExchangeRate.McExchange/NbpExchange.cs
+++ b/src/Plugins/ExchangeRate.McExchange/NbpExchange.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
using System.Net.Http;
using System.Net.Mime;
-using System.Threading.Tasks;
using System.Xml;
namespace ExchangeRate.McExchange
diff --git a/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs b/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
index a632418fd..5fe4076e5 100644
--- a/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
+++ b/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
@@ -6,7 +6,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Payments.BrainTree.Models;
-using System.Threading.Tasks;
namespace Payments.BrainTree.Controllers
{
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
index e0d18801f..dcfa1819d 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Payments.BrainTree
{
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
index 541770e22..0ebc15986 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -14,9 +14,6 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Primitives;
using Payments.BrainTree.Models;
using Payments.BrainTree.Validators;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Payments.BrainTree
{
diff --git a/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
index bc6094381..fc1eb45c2 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
@@ -1,7 +1,5 @@
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Payments.BrainTree
{
diff --git a/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs b/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
index bd679e66c..d9b00a185 100644
--- a/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
+++ b/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
@@ -8,10 +8,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Payments.BrainTree.Models;
using Payments.BrainTree.Validators;
-using System;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Payments.BrainTree.Components
{
diff --git a/src/Plugins/Payments.BrainTree/Models/PaymentInfoModel.cs b/src/Plugins/Payments.BrainTree/Models/PaymentInfoModel.cs
index 1126a6404..64560a2a3 100644
--- a/src/Plugins/Payments.BrainTree/Models/PaymentInfoModel.cs
+++ b/src/Plugins/Payments.BrainTree/Models/PaymentInfoModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Payments.BrainTree.Models
{
diff --git a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
index 93b54cba8..d8e0d8dcb 100644
--- a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
@@ -10,8 +10,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Payments.CashOnDelivery.Models;
-using System.Linq;
-using System.Threading.Tasks;
namespace Payments.CashOnDelivery.Controllers
{
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
index 86f3718d3..0f1f96842 100644
--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
@@ -2,7 +2,6 @@ using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Payments.CashOnDelivery
{
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
index 725dc7bd6..6809b7480 100644
--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
@@ -10,9 +10,6 @@ using Grand.Domain.Payments;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Payments.CashOnDelivery
{
diff --git a/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs b/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
index f3d9560f5..85f3c92b0 100644
--- a/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Models/ConfigurationModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Payments.CashOnDelivery.Models
{
diff --git a/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs b/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
index 3f196d486..604f5f147 100644
--- a/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
+++ b/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
@@ -11,8 +11,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Payments.PayPalStandard.Models;
-using System.Linq;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard.Controllers
{
diff --git a/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs b/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
index 90c265789..498f3615f 100644
--- a/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
+++ b/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
@@ -15,13 +15,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Primitives;
using Payments.PayPalStandard.Services;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard.Controllers
{
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
index 70f8dec9e..5e7191cb4 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
@@ -2,7 +2,6 @@ using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard
{
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index 630a6318a..e34ff4702 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -15,11 +15,7 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard
{
diff --git a/src/Plugins/Payments.PayPalStandard/Services/IPaypalHttpClient.cs b/src/Plugins/Payments.PayPalStandard/Services/IPaypalHttpClient.cs
index 98565c5cb..cb2615688 100644
--- a/src/Plugins/Payments.PayPalStandard/Services/IPaypalHttpClient.cs
+++ b/src/Plugins/Payments.PayPalStandard/Services/IPaypalHttpClient.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Payments.PayPalStandard.Services
+namespace Payments.PayPalStandard.Services
{
public interface IPaypalHttpClient
{
diff --git a/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs b/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
index e16e3ceeb..53dd72592 100644
--- a/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
+++ b/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
@@ -1,9 +1,5 @@
using Grand.Business.Common.Interfaces.Logging;
-using System;
-using System.Collections.Generic;
using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
namespace Payments.PayPalStandard.Services
{
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs b/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
index df52ea9a1..08e3c08bc 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
@@ -14,11 +14,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Shipping.ByWeight.Domain;
using Shipping.ByWeight.Models;
using Shipping.ByWeight.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Shipping.ByWeight.Controllers
{
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
index 3acad9b83..dd0984888 100644
--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Domain.Orders;
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shipping.ByWeight
{
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
index 54b5bf9d3..513f58dd1 100644
--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
@@ -16,10 +16,6 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Shipping.ByWeight.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Shipping.ByWeight
{
diff --git a/src/Plugins/Shipping.ByWeight/Models/ShippingByWeightModel.cs b/src/Plugins/Shipping.ByWeight/Models/ShippingByWeightModel.cs
index 7dd51e41f..377e6d3e5 100644
--- a/src/Plugins/Shipping.ByWeight/Models/ShippingByWeightModel.cs
+++ b/src/Plugins/Shipping.ByWeight/Models/ShippingByWeightModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Shipping.ByWeight.Models
{
diff --git a/src/Plugins/Shipping.ByWeight/Services/IShippingByWeightService.cs b/src/Plugins/Shipping.ByWeight/Services/IShippingByWeightService.cs
index 29cc47ea0..9a0ce8572 100644
--- a/src/Plugins/Shipping.ByWeight/Services/IShippingByWeightService.cs
+++ b/src/Plugins/Shipping.ByWeight/Services/IShippingByWeightService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Shipping.ByWeight.Domain;
-using System.Threading.Tasks;
namespace Shipping.ByWeight.Services
{
diff --git a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
index 18b9672f0..738c6f6f7 100644
--- a/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
+++ b/src/Plugins/Shipping.ByWeight/Services/ShippingByWeightService.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Shipping.ByWeight.Domain;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Shipping.ByWeight.Services
{
diff --git a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
index 92edd6fdf..e7d04b513 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
@@ -7,8 +7,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Microsoft.AspNetCore.Mvc;
using Shipping.FixedRateShipping.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shipping.FixedRateShipping.Controllers
{
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
index 424604ff1..82fabd6fe 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Shipping.FixedRateShipping
{
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
index 68bad4443..9eb7e14f4 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
@@ -10,9 +10,6 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Shipping.FixedRateShipping.Models;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shipping.FixedRateShipping
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
index 1937998f3..7938b1978 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
@@ -12,8 +12,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Shipping.ShippingPoint.Models;
using Shipping.ShippingPoint.Services;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint.Controllers
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs b/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
index 07872d664..aea032d06 100644
--- a/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
@@ -3,9 +3,6 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Shipping.ShippingPoint.Services;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint.Components
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
index 3b8a9b1a7..ab36f46ae 100644
--- a/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Microsoft.AspNetCore.Mvc;
using Shipping.ShippingPoint.Models;
using Shipping.ShippingPoint.Services;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint.Controllers
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Models/ShippingPointModel.cs b/src/Plugins/Shipping.ShippingPoint/Models/ShippingPointModel.cs
index c0b2fc2a1..69946f229 100644
--- a/src/Plugins/Shipping.ShippingPoint/Models/ShippingPointModel.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Models/ShippingPointModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Shipping.ShippingPoint.Models
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Services/IShippingPointService.cs b/src/Plugins/Shipping.ShippingPoint/Services/IShippingPointService.cs
index 2ded5dd0a..edc238b86 100644
--- a/src/Plugins/Shipping.ShippingPoint/Services/IShippingPointService.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Services/IShippingPointService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Shipping.ShippingPoint.Domain;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint.Services
{
diff --git a/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs b/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs
index a76ab486f..fc4ad3ffc 100644
--- a/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Services/ShippingPointService.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Shipping.ShippingPoint.Domain;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint.Services
{
diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
index f811c7a98..32f7a4471 100644
--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Shipping.ShippingPoint
{
diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
index e5dfd38bf..3d07e07a3 100644
--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
@@ -10,11 +10,6 @@ using Grand.Domain.Shipping;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
using Shipping.ShippingPoint.Services;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
using System.Xml.Serialization;
namespace Shipping.ShippingPoint
diff --git a/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs b/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
index c9841e14f..1c855606b 100644
--- a/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
using Shipping.ShippingPoint.Models;
-using System.Collections.Generic;
namespace Shipping.ShippingPoint.Validators
{
diff --git a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
index 9d0a45869..f4055f04c 100644
--- a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
+++ b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
@@ -8,10 +8,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Tax.CountryStateZip.Domain;
using Tax.CountryStateZip.Models;
using Tax.CountryStateZip.Services;
diff --git a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
index d7b4caad1..0a0e90d7d 100644
--- a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
+++ b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Tax.CountryStateZip
{
diff --git a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
index 20b5bf9cd..95f45f044 100644
--- a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
+++ b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
@@ -3,10 +3,6 @@ using Grand.Business.Catalog.Utilities;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Tax.CountryStateZip.Infrastructure.Cache;
using Tax.CountryStateZip.Services;
diff --git a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
index 655893ba4..df2ccd439 100644
--- a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
+++ b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
@@ -2,9 +2,6 @@
using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
using Tax.CountryStateZip.Domain;
namespace Tax.CountryStateZip.Infrastructure.Cache
diff --git a/src/Plugins/Tax.CountryStateZip/Models/TaxRateListModel.cs b/src/Plugins/Tax.CountryStateZip/Models/TaxRateListModel.cs
index 15a287f4e..7b8db02c7 100644
--- a/src/Plugins/Tax.CountryStateZip/Models/TaxRateListModel.cs
+++ b/src/Plugins/Tax.CountryStateZip/Models/TaxRateListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Tax.CountryStateZip.Models
{
diff --git a/src/Plugins/Tax.CountryStateZip/Services/ITaxRateService.cs b/src/Plugins/Tax.CountryStateZip/Services/ITaxRateService.cs
index 26f9fa68e..9cb2b6bd8 100644
--- a/src/Plugins/Tax.CountryStateZip/Services/ITaxRateService.cs
+++ b/src/Plugins/Tax.CountryStateZip/Services/ITaxRateService.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Tax.CountryStateZip.Domain;
-using System.Threading.Tasks;
namespace Tax.CountryStateZip.Services
{
diff --git a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
index 8af1f2aac..ee11a035b 100644
--- a/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
+++ b/src/Plugins/Tax.CountryStateZip/Services/TaxRateService.cs
@@ -3,9 +3,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Extensions;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Tax.CountryStateZip.Domain;
namespace Tax.CountryStateZip.Services
diff --git a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
index 608c62d7a..4a79ea36f 100644
--- a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
+++ b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
@@ -6,8 +6,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
using Tax.FixedRate.Models;
namespace Tax.FixedRate.Controllers
diff --git a/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs b/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
index 3222a1537..2e4e54cb7 100644
--- a/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
+++ b/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Tax.FixedRate
{
diff --git a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
index 13112111d..b651b0382 100644
--- a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
+++ b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
@@ -2,8 +2,6 @@
using Grand.Business.Catalog.Utilities;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
using Tax.FixedRate.Models;
namespace Tax.FixedRate
diff --git a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
index ab02e98dd..0dda0f4bb 100644
--- a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
@@ -9,8 +9,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.FacebookPixel.Models;
namespace Widgets.FacebookPixel.Controllers
diff --git a/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs b/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
index 569f65166..aa0a726e8 100644
--- a/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Globalization;
-using System.Threading.Tasks;
using Widgets.FacebookPixel.Models;
namespace Widgets.FacebookPixel.Components
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
index a92f870b2..a94b27438 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
@@ -1,5 +1,4 @@
using Grand.Business.Common.Interfaces.Directory;
-using System.Threading.Tasks;
namespace Widgets.FacebookPixel
{
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
index d7ed24f3c..1486f1274 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Widgets.FacebookPixel
{
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
index a6dd4cb16..9e4b3f780 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
@@ -1,7 +1,5 @@
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Widgets.FacebookPixel
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
index 15b9b10eb..40c8fd26a 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
@@ -10,8 +10,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.GoogleAnalytics.Models;
namespace Widgets.GoogleAnalytics.Controllers
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
index 26dd27ba3..41bca46e2 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
@@ -9,11 +9,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
-using System;
using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Widgets.GoogleAnalytics.Components
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
index b9499c451..27bba2b95 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
@@ -2,8 +2,6 @@ using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Configuration;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Widgets.GoogleAnalytics
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
index 104eb0351..f363d08df 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
@@ -1,7 +1,5 @@
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Widgets.GoogleAnalytics
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
index 09b00ec6a..1a8c72720 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
@@ -1,5 +1,4 @@
using Grand.Business.Common.Interfaces.Directory;
-using System.Threading.Tasks;
namespace Widgets.GoogleAnalytics
{
diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
index 09fd3781e..b73f08550 100644
--- a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
@@ -8,9 +8,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.Slider.Models;
using Widgets.Slider.Services;
diff --git a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
index c30490d66..ca6620088 100644
--- a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
@@ -3,9 +3,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
using Widgets.Slider.Services;
diff --git a/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs b/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs
index 8cb4fe55b..5ca0920d4 100644
--- a/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs
+++ b/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs
@@ -1,7 +1,6 @@
using Grand.Domain;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using System.Collections.Generic;
namespace Widgets.Slider.Domain
{
diff --git a/src/Plugins/Widgets.Slider/Extensions.cs b/src/Plugins/Widgets.Slider/Extensions.cs
index 9443c76b1..525383d9b 100644
--- a/src/Plugins/Widgets.Slider/Extensions.cs
+++ b/src/Plugins/Widgets.Slider/Extensions.cs
@@ -1,8 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Domain.Localization;
using Grand.Infrastructure.Mapper;
-using System;
-using System.Collections.Generic;
using System.Reflection;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
diff --git a/src/Plugins/Widgets.Slider/Infrastructure/Mapper/SliderMapperConfiguration.cs b/src/Plugins/Widgets.Slider/Infrastructure/Mapper/SliderMapperConfiguration.cs
index 2ea73a6f1..979cc4840 100644
--- a/src/Plugins/Widgets.Slider/Infrastructure/Mapper/SliderMapperConfiguration.cs
+++ b/src/Plugins/Widgets.Slider/Infrastructure/Mapper/SliderMapperConfiguration.cs
@@ -1,6 +1,5 @@
using AutoMapper;
using Grand.Infrastructure.Mapper;
-using System.Linq;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
diff --git a/src/Plugins/Widgets.Slider/Models/PublicInfoModel.cs b/src/Plugins/Widgets.Slider/Models/PublicInfoModel.cs
index 866b16df5..f1ad14a69 100644
--- a/src/Plugins/Widgets.Slider/Models/PublicInfoModel.cs
+++ b/src/Plugins/Widgets.Slider/Models/PublicInfoModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Widgets.Slider.Models
{
diff --git a/src/Plugins/Widgets.Slider/Models/SlideModel.cs b/src/Plugins/Widgets.Slider/Models/SlideModel.cs
index 88e94301b..8403fdb45 100644
--- a/src/Plugins/Widgets.Slider/Models/SlideModel.cs
+++ b/src/Plugins/Widgets.Slider/Models/SlideModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Widgets.Slider.Models
diff --git a/src/Plugins/Widgets.Slider/Services/ISliderService.cs b/src/Plugins/Widgets.Slider/Services/ISliderService.cs
index 537fb2932..8ed4bf97f 100644
--- a/src/Plugins/Widgets.Slider/Services/ISliderService.cs
+++ b/src/Plugins/Widgets.Slider/Services/ISliderService.cs
@@ -1,6 +1,4 @@
using Widgets.Slider.Domain;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Widgets.Slider.Services
{
diff --git a/src/Plugins/Widgets.Slider/Services/SliderService.cs b/src/Plugins/Widgets.Slider/Services/SliderService.cs
index 2ebb3468f..959efcd52 100644
--- a/src/Plugins/Widgets.Slider/Services/SliderService.cs
+++ b/src/Plugins/Widgets.Slider/Services/SliderService.cs
@@ -2,10 +2,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.Slider.Domain;
namespace Widgets.Slider.Services
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
index 6d673fabc..48b7d3a77 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
@@ -4,9 +4,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Domain.Data;
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
using Widgets.Slider.Domain;
namespace Widgets.Slider
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
index 674ab0b2a..7ef43f289 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
@@ -1,7 +1,5 @@
using Grand.Business.Cms.Interfaces;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Widgets.Slider
{
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetSettings.cs b/src/Plugins/Widgets.Slider/SliderWidgetSettings.cs
index d22ebed00..ec25066c8 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetSettings.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetSettings.cs
@@ -1,5 +1,4 @@
using Grand.Domain.Configuration;
-using System.Collections.Generic;
namespace Widgets.Slider
{
diff --git a/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs b/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
index e992637a2..0d40b3580 100644
--- a/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
+++ b/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
@@ -1,7 +1,6 @@
using FluentValidation;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
-using System.Collections.Generic;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
diff --git a/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
index 31b9f91de..be3140bac 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
@@ -8,9 +8,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Tests
{
diff --git a/src/Tests/Grand.Business.Authentication.Tests/AuthSchemaMock.cs b/src/Tests/Grand.Business.Authentication.Tests/AuthSchemaMock.cs
index 339f2531d..8ec665c59 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/AuthSchemaMock.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/AuthSchemaMock.cs
@@ -1,7 +1,5 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Tests
{
diff --git a/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
index dcb8e1656..5dfbe001c 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
@@ -8,10 +8,7 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
using System.Security.Claims;
-using System.Threading.Tasks;
namespace Grand.Business.Authentication.Tests
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
index 41640d4b4..ebe9a0d7a 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
@@ -1,8 +1,6 @@
using Grand.Business.Catalog.Extensions;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Catalog.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
index 7487e6bce..0b947ef9c 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
@@ -8,9 +8,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Handlers
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryLayoutServiceTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryLayoutServiceTest.cs
index 639143139..f6ae4d89c 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryLayoutServiceTest.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryLayoutServiceTest.cs
@@ -6,8 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Category
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
index 0bc8eb53c..aac53fd5b 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
@@ -11,11 +11,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Category
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
index 8ed080f83..5086daf38 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
@@ -9,9 +9,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Collections
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
index eebf584b6..5969ee111 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
@@ -15,8 +15,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
namespace Grand.Business.Catalog.Tests.Service.Prices
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
index 39cd2f501..378104b7f 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
@@ -23,9 +23,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Prices
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
index cdf27e9e4..db73cf362 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Seo;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Products
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CustomerGroupProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CustomerGroupProductServiceTests.cs
index 292bfee81..6690fbd97 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CustomerGroupProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CustomerGroupProductServiceTests.cs
@@ -6,10 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Products
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/ProductAttributeParserTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/ProductAttributeParserTests.cs
index f5384b854..0d556bed8 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/ProductAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/ProductAttributeParserTests.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Catalog.Tests.Service.Products
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
index 3ec4807ef..3d7ee17c4 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
@@ -2,8 +2,6 @@
using Grand.Business.Catalog.Utilities;
using Grand.Infrastructure.Plugins;
using Microsoft.AspNetCore.Routing;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Catalog.Tests.Service.Tax
{
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 08b843e77..63ca13ca4 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
@@ -8,9 +8,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Infrastructure;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
using Grand.Domain.Catalog;
using Grand.SharedKernel.Extensions;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
index d60262ea5..b54b49663 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
@@ -8,8 +8,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Commands.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
index 1edb732d0..242be43a2 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
@@ -2,7 +2,6 @@
using Grand.Business.Checkout.Commands.Models.Orders;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Commands.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
index 6d53d5189..e05c8466a 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
@@ -11,9 +11,6 @@ using Grand.Domain.Shipping;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Commands.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
index 9708c6e51..fe3e718be 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Payments;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Commands.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
index cc649a66f..71b584612 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
index b452b07d3..e407cc887 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
namespace Grand.Business.Checkout.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
index 3bee1869b..096a38129 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
@@ -3,7 +3,6 @@ using Grand.Business.Checkout.Interfaces.Payments;
using Grand.Domain.Payments;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
namespace Grand.Business.Checkout.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
index 30344b23e..452f1f30a 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
@@ -3,7 +3,6 @@ using Grand.Business.Checkout.Interfaces.Shipping;
using Grand.Domain.Shipping;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
namespace Grand.Business.Checkout.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
index e271dc909..e8ec3b1f6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
@@ -1,8 +1,6 @@
using Grand.Business.Checkout.Extensions;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
index 42cbb2679..4644785a6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
@@ -12,8 +12,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributes
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
index 8e206640b..0bd65d0c2 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
@@ -8,9 +8,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.CheckoutAttributes
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
index e355a4968..52f32f716 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
@@ -6,11 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.GiftVouchers
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
index 5ce346fca..3416e998a 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
index b0568d43e..11bdf6f0b 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs
@@ -6,9 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Orders
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
index 93be90e86..213ad8e53 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
@@ -7,10 +7,6 @@ using Grand.Domain.Payments;
using Grand.SharedKernel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Payments
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
index ddff6ce57..14bf188ce 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Payments
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
index 7d12752d6..aa076dfe7 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Shipping
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
index ca3ce3ace..b37c40e3c 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Shipping
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
index 8beb21ebb..82974bcc5 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Shipping
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
index a50d25b71..9a995aece 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
@@ -10,9 +10,6 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Shipping
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
index 410c6fac8..5ef9c0275 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Checkout.Tests.Services.Shipping
{
diff --git a/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
index 0ff81b07d..5e54d34d9 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
@@ -5,7 +5,6 @@ using Grand.Domain.Seo;
using Grand.Infrastructure.Events;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Tests.Events
{
diff --git a/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs b/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
index 19f48e54e..c8dbaa710 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
@@ -1,9 +1,6 @@
using Grand.Business.Cms.Extensions;
using Grand.Domain.Blogs;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Cms.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
index 582024dcc..9d69c42ca 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/BlogServiceTests.cs
@@ -6,9 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
index 2c09db90f..4ee402361 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
@@ -3,8 +3,6 @@ using Grand.Business.Cms.Services;
using Grand.Domain.Cms;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Cms.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs b/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
index 97e30b6d3..9eb952343 100644
--- a/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Permissions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Linq;
namespace Grand.Business.Common.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
index 3c714181e..7d9fc1a6b 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
@@ -4,9 +4,6 @@ using Grand.Business.Common.Services.Addresses;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Addresses
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
index c39df58d3..dc3acc5ef 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs
@@ -7,7 +7,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Addresses
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs
index 21124f6bd..0d03db096 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Configuration/SettingServiceTests.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Configuration
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CookiePreferenceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CookiePreferenceTests.cs
index 119cfd4b2..a2dffe386 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CookiePreferenceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CookiePreferenceTests.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
index 03a225096..5482fc2aa 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
@@ -11,8 +11,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
index f96ab42f9..9cf24aebe 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Services.Directory;
using Grand.Domain.Directory;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
index 87d148c0d..40b54cc70 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Domain.Data;
using Grand.Domain.History;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/MeasureServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/MeasureServiceTests.cs
index 4c78e80c8..b0a00aa83 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/MeasureServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/MeasureServiceTests.cs
@@ -6,7 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/SearchTermServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/SearchTermServiceTests.cs
index 77fb6762c..deefab6b4 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/SearchTermServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/SearchTermServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Directory
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Security/EncryptionServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Security/EncryptionServiceTests.cs
index 843b1e59a..86f0a650b 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Security/EncryptionServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Security/EncryptionServiceTests.cs
@@ -1,6 +1,5 @@
using Grand.Business.Common.Services.Security;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
namespace Grand.Business.Common.Tests.Services.Security
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
index acd9331a6..af17a93bc 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Security
{
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
index 7a4ad46ca..8a5d05813 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Stores/StoreServiceTests.cs
@@ -6,9 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Common.Tests.Services.Stores
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
index b31064949..e8e5f852c 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Affiliates;
using Grand.Infrastructure;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
index 47c5050a2..aca02f006 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
@@ -7,8 +7,6 @@ using Grand.Domain.Customers;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Handler
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
index 6de8fe3ad..e9d731a4b 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
index a905407b8..b96989a63 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
index a40001689..33df32592 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeServiceTests.cs
@@ -6,8 +6,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
index ca04aa194..9898dda0e 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerNoteServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
index cdbf64111..ba503fb19 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/UserApiServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
index 5b730f017..dd8597058 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/VendorServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Customers.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
index 6bfcc4dcf..13c36fb48 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
@@ -1,8 +1,6 @@
using Grand.Business.Marketing.Extensions;
using Grand.Domain.Knowledgebase;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Business.Marketing.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Banners/BannerServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Banners/BannerServiceTests.cs
index dbcb88ed5..6b6470412 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Banners/BannerServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Banners/BannerServiceTests.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Banners
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/PopupServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/PopupServiceTests.cs
index c8f93c7c0..fa4f19267 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/PopupServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/PopupServiceTests.cs
@@ -6,8 +6,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Contacts
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
index 3711e1a9a..009100afc 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseActionServiceTests.cs
@@ -5,9 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Courses
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
index d8f31b050..bb59bcb7f 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CoursesServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Courses
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
index ad03e2104..8e06a7893 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Documents
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
index ba125d85e..6149ce31d 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs
@@ -7,10 +7,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Documents
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
index 74057aefc..7da62b769 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
@@ -10,8 +10,6 @@ using Grand.SharedKernel;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Newsletters
{
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
index 8057292ad..3318869ef 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Marketing.Tests.Services.Newsletters
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
index 1d2c45078..2bcdfc099 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
@@ -5,8 +5,6 @@ using Grand.Domain.Data;
using Grand.Domain.Messages;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Commands
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
index 1acc8877c..6b463c8ea 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/EmailAccountServiceTests.cs
@@ -7,9 +7,6 @@ using Grand.SharedKernel;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
index 7c0668d29..ed4385557 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Vendors;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
index 9b548af48..2eb36ca89 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
@@ -15,8 +15,6 @@ using Grand.Infrastructure;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
index 27248668a..20be70176 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
@@ -8,8 +8,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
index a307bf4ed..03d7dbf6d 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/QueuedEmailServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Messages.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs b/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
index ba36e2625..94f1200f4 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
@@ -2,10 +2,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
namespace Grand.Business.Storage.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
index baa7079a6..0f332600e 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Services/DownloadServiceTests.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.Events;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Tests.Services
{
diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
index adbf05928..cb14a9ec4 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
@@ -10,8 +10,6 @@ using MediatR;
using Microsoft.AspNetCore.Hosting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.Storage.Tests.Services
{
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
index b583b4331..c94de89ba 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
@@ -4,7 +4,6 @@ using Grand.Business.System.Commands.Handlers.Catalog;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Commands
{
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
index 59140c02d..9a0858a97 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
@@ -5,7 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Commands
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs b/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs
index beffe1ba9..96a51b178 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Admin/AdminSiteMapServiceTests.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.Admin
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
index 91c3eab5d..468b51fcb 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
@@ -3,8 +3,6 @@ using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
index 2fa14c55f..522b37130 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Caching;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
index f2dc59bd7..30566506d 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
@@ -2,7 +2,6 @@
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
index 4ec1911e2..a9edcf044 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
@@ -2,7 +2,6 @@
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
index b8ae5f385..af9915a4e 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
@@ -2,7 +2,6 @@
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
index 6cb6255b1..28fc9c8c3 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
@@ -3,8 +3,6 @@ using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
index 36a4af130..3a233763d 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
@@ -13,9 +13,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
index b9d7d54f0..25bbdb526 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
@@ -7,9 +7,6 @@ using Grand.Domain.Logging;
using Grand.Domain.Messages;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
index f6d0fcb22..135bd4f88 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
@@ -3,8 +3,6 @@ using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Directory;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs b/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
index f6dfa0bc5..eb261537f 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using NPOI.XSSF.UserModel;
-using System;
-using System.Collections.Generic;
-using System.IO;
namespace Grand.Business.System.Tests.Services.ExportImport
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
index 69c220d70..a85a7a7e3 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Migrations;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Linq;
namespace Grand.Business.System.Tests.Services.Migrations
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
index 123eded46..cfc23bc15 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
@@ -3,7 +3,6 @@ using Grand.Business.System.Services.Migrations;
using Grand.Domain.Data;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-using System;
namespace Grand.Business.System.Tests.Services.Migrations
{
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 54935ed3b..b3b0f0d72 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,6 +1,5 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
-using System;
namespace Grand.Business.System.Tests.Services.Migrations
{
diff --git a/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs b/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
index 4c07ad561..748f92b98 100644
--- a/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
+++ b/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
@@ -4,8 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
index 70f6ce704..0167fa55f 100644
--- a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
+++ b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
@@ -3,9 +3,6 @@ using Grand.Infrastructure;
using Grand.Web.Admin.Models.Cms;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/Affiliate.cs b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
index 81af902b3..dc281c8a5 100644
--- a/src/Web/Grand.Web.Admin/Components/Affiliate.cs
+++ b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
@@ -7,9 +7,6 @@ using Grand.Business.Common.Services.Security;
using Grand.Web.Admin.Models.Affiliates;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.Checkout.Interfaces.Orders;
diff --git a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
index 60264a131..af5a4c412 100644
--- a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
+++ b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
index 4615116d6..1ac57b23f 100644
--- a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
+++ b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs b/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
index 17ae7b7f9..d17758982 100644
--- a/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
+++ b/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs b/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
index b4f71932f..1854ed64a 100644
--- a/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
+++ b/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/LatestOrder.cs b/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
index 469b9c9ec..1eb5c8720 100644
--- a/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
+++ b/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Services.Security;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs b/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
index 948646a76..eb9970774 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs b/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
index 38eb44561..3294d91be 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs b/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
index abae4d4c3..8b457c20c 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs b/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
index 2c8b66726..2437356b9 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs b/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
index ff73feaca..eac29b729 100644
--- a/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Services.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/StoreScope.cs b/src/Web/Grand.Web.Admin/Components/StoreScope.cs
index 2516db89b..41d0c3736 100644
--- a/src/Web/Grand.Web.Admin/Components/StoreScope.cs
+++ b/src/Web/Grand.Web.Admin/Components/StoreScope.cs
@@ -5,10 +5,7 @@ using Grand.Domain.Customers;
using Grand.Web.Common.Components;
using Grand.Web.Admin.Models.Settings;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Directory;
-using System.Linq;
-using System.Collections.Generic;
using Grand.Domain.Stores;
namespace Grand.Web.Admin.Components
diff --git a/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs b/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
index 6e7375862..5be01421c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
@@ -7,10 +7,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
index bc985fecf..b9935d838 100644
--- a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
@@ -8,9 +8,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
index 64ee3caf8..2244dd62c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
@@ -11,9 +11,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs b/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
index 1ccff43ff..0d6512e6d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
@@ -8,9 +8,6 @@ using Grand.SharedKernel.Extensions;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs b/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
index ab02ca34c..e5d30c95f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
@@ -8,9 +8,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;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs b/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
index b001c1908..974793b5c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
@@ -7,8 +7,6 @@ using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Grand.Business.Common.Interfaces.Directory;
diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
index 6384620fb..91b6bd0b1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
@@ -15,10 +15,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
index af76a2c30..c13d4fcf0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
@@ -17,9 +17,6 @@ using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs b/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
index 4506f643e..dc5e8c4d9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
@@ -15,11 +15,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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
index ea8c3f8d0..6707f300f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
@@ -17,9 +17,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
index 8f5032878..6119a6eb1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
@@ -15,9 +15,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;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
index 8c3bc73a9..b7ca432bc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
@@ -17,9 +17,6 @@ using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
index 752844226..5e7bce0c2 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
@@ -13,9 +13,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Infrastructure;
namespace Grand.Web.Admin.Controllers
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
index f3394391c..6ccee74b3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
@@ -7,7 +7,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
index 13a97dc64..036bb99f5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
@@ -12,10 +12,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
index 627192aef..7fadbbe4a 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
@@ -15,9 +15,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Courses;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
index c20d7a36c..fe8b183d5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
@@ -16,11 +16,7 @@ using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
index da000d9f3..ff0ed891f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
@@ -20,10 +20,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
index c3f3a2f64..1026016d9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
@@ -5,10 +5,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
index 5f5c3fc95..5910cbf86 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
@@ -8,8 +8,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
index 617d2b454..a8a6dd4af 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -27,10 +27,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
index 0a7018ee5..fd90f4fe7 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
@@ -13,10 +13,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
index 2905b9e01..a3c8d648d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
@@ -17,10 +17,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
index cc054fdef..e59b8b7a9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
@@ -9,10 +9,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
index 89b303e78..c51d80a63 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
@@ -18,10 +18,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
index f1f8d8f23..e61db73b0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
@@ -11,8 +11,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs b/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
index d3d66e750..d82b0f919 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
@@ -5,10 +5,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Media;
using Grand.Web.Admin.Extensions;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs b/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
index 8a8940d28..ea303c1e9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Services.Security;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
index 5730e25dd..c7f30097c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
@@ -12,9 +12,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;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs b/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
index 8f18ec552..5920d727f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
@@ -9,10 +9,6 @@ using Grand.Infrastructure.Plugins;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.ExternalAuthentication;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
index 65048b569..c3a2b6535 100644
--- a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
@@ -8,9 +8,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;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/GoogleAnalyticsController.cs b/src/Web/Grand.Web.Admin/Controllers/GoogleAnalyticsController.cs
index bbb41b577..0b6dc4ba2 100644
--- a/src/Web/Grand.Web.Admin/Controllers/GoogleAnalyticsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/GoogleAnalyticsController.cs
@@ -1,7 +1,5 @@
using Grand.Business.Common.Interfaces.Directory;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
diff --git a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
index d0b656062..389593392 100644
--- a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
@@ -16,10 +16,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Home;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
index 4877d822b..f87376813 100644
--- a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
@@ -11,10 +11,6 @@ using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Grand.Infrastructure;
namespace Grand.Web.Admin.Controllers
diff --git a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
index 96d3a78ed..eb085beaa 100644
--- a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
@@ -12,9 +12,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
index 3735fec26..0285fd352 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
@@ -9,11 +9,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Localization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs b/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
index 699fd1f4a..854b47cbb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
@@ -11,9 +11,6 @@ using Grand.Domain.Pages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Layouts;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Brands;
namespace Grand.Web.Admin.Controllers
diff --git a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs b/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
index dfe443c57..0a825278c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
@@ -6,9 +6,6 @@ using Grand.Web.Admin.Models.Logging;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
index 37313d773..adc3b8e19 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
@@ -15,7 +15,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
index 31fe2c621..0183be7bc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
@@ -18,9 +18,6 @@ using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using SkiaSharp;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs b/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
index 220fbb6b0..696224e83 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
@@ -10,9 +10,6 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Directory;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
index b2e067b1b..874c28629 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
@@ -14,9 +14,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
index 123479cd2..89a4f66cc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
@@ -12,10 +12,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
index 65b59c1e6..68c7c8382 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
@@ -13,8 +13,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.News;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
index fcdb52f66..138b27f5f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
@@ -8,8 +8,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
index 14d5acd24..24675a9dd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
@@ -14,11 +14,6 @@ using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
index dd1d78969..c0ed064e8 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
@@ -9,9 +9,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 8c34d9f35..42391ffdf 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -21,11 +21,6 @@ using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
index 72d39d95c..e9eec59f0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
@@ -7,9 +7,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
index 5e35e9167..dcf6a7985 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
@@ -6,10 +6,6 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PageController.cs b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
index 1738abfff..49cfc75d1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
@@ -11,8 +11,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Pages;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
index e16b3e6c8..4ac307286 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
@@ -15,10 +15,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
index 86cdee10e..a7fe4bda9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
@@ -16,10 +16,6 @@ using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
index 211afb5b7..14268d7f9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
@@ -12,10 +12,6 @@ using Grand.Web.Admin.Models.Permissions;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
index b2dfc36e2..6101b6860 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
@@ -8,10 +8,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.StaticFiles;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
index 02e6dcb6e..e64fff333 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
@@ -15,13 +15,8 @@ using Grand.Web.Common.Themes;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.IO;
using System.IO.Compression;
-using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
index 482d2908e..959e2597b 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
@@ -13,9 +13,6 @@ using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index 3614e8210..5b5d6a1cc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -28,11 +28,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.StaticFiles;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
index 29c888b10..24a9ea9c3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
@@ -9,9 +9,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
index dd3fdee72..fd3409ada 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
@@ -9,10 +9,6 @@ using Grand.Domain.Seo;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs b/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
index 04dd559f8..c75a0d285 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
@@ -10,10 +10,6 @@ using Grand.Web.Common.Security.Authorization;
using Grand.Domain.PushNotifications;
using Grand.Web.Admin.Models.PushNotifications;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
index 141be7980..6907f5ff1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
@@ -12,10 +12,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
index a4a1b0a64..080285161 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
@@ -25,10 +25,6 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs b/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
index 2638e86b1..1a6d17717 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
@@ -11,9 +11,6 @@ using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Infrastructure;
namespace Grand.Web.Admin.Controllers
diff --git a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
index 4fe4076cb..e05fc46ec 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
@@ -12,9 +12,6 @@ using Grand.Web.Admin.Models.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs b/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
index 5b60cf4ee..885e6bd2b 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
@@ -12,10 +12,6 @@ using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Settings;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Common.DataSource;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index 49d32daa0..ae15363fd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -39,10 +39,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
index 4dbb7cb42..116ceb272 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
@@ -17,11 +17,6 @@ using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index 4eb61b256..2527ba589 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -19,10 +19,6 @@ using Grand.Web.Admin.Models.Shipping;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Web.Admin.Models.Common;
using Grand.Business.Common.Interfaces.Logging;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
index 92278d391..e1d6217b1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
@@ -11,10 +11,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Models.ShoppingCart;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
index 90fb7c75a..a45d14c5d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
@@ -13,10 +13,6 @@ using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
index 377b89ba4..74f0780de 100644
--- a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
@@ -9,8 +9,6 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/SystemController.cs b/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
index f6bd0fce4..79e1ac5e9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
@@ -19,11 +19,7 @@ using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Runtime.InteropServices;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
index b3ce85447..def971278 100644
--- a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
@@ -12,10 +12,6 @@ using Grand.Infrastructure.Plugins;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Tax;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Rendering;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Common.Interfaces.Directory;
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
index a813eac4c..9d6b2e3bb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
@@ -12,10 +12,6 @@ using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
index 327e280af..9b40542f1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
@@ -10,10 +10,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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs b/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
index 1f011289d..11379957d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
@@ -9,10 +9,6 @@ using Grand.Web.Admin.Models.Cms;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs b/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
index 1234e13b3..ef1066e5a 100644
--- a/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/AclMappingExtension.cs
@@ -1,6 +1,5 @@
using Grand.Domain;
using Grand.Domain.Stores;
-using System.Linq;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/AllowedFileExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/AllowedFileExtensions.cs
index 9ef4ee384..c482be3d8 100644
--- a/src/Web/Grand.Web.Admin/Extensions/AllowedFileExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/AllowedFileExtensions.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Grand.Web.Admin.Extensions
+namespace Grand.Web.Admin.Extensions
{
public static class FileExtensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs b/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
index f4791f30a..7d33fcce4 100644
--- a/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
@@ -2,10 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/HasAccess.cs b/src/Web/Grand.Web.Admin/Extensions/HasAccess.cs
index b63244314..02cc5c8ef 100644
--- a/src/Web/Grand.Web.Admin/Extensions/HasAccess.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/HasAccess.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-using System;
-using System.Linq;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs b/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
index 43b442233..8434b2bc0 100644
--- a/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
@@ -5,11 +5,8 @@ using Grand.Web.Common.Models;
using Grand.Domain;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
using System.Linq.Expressions;
using System.Reflection;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
index 664fbddbe..1221c5d9e 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
@@ -5,10 +5,6 @@ using Grand.Infrastructure.Mapper;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Admin.Models.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
index 5804dc3f5..7901b8951 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
@@ -1,5 +1,4 @@
using Grand.Business.Common.Interfaces.Directory;
-using System;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
index a94d3cd2e..0cab91e0a 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Business.Checkout.Interfaces.Payments;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Payments;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs
index 3438107c7..256e2440e 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Settings;
using Grand.Web.Common.Themes;
-using System;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
index 6cd0e2847..8628a42d5 100644
--- a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure;
using Grand.Infrastructure.Plugins;
-using System;
-using System.IO;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/ProductList.cs b/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
index 5af6e3832..a8d0a348b 100644
--- a/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
@@ -1,9 +1,6 @@
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Domain;
using Grand.Domain.Catalog;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
index 463891cb3..6f4029881 100644
--- a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
@@ -1,5 +1,4 @@
using Grand.Business.Storage.Interfaces;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
index 5073d54fc..82a77ad31 100644
--- a/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
@@ -1,6 +1,5 @@
using Grand.Business.Cms.Interfaces;
using Grand.Domain.Cms;
-using System;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IActivityLogViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IActivityLogViewModelService.cs
index 2f61fd45f..9696c5423 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IActivityLogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IActivityLogViewModelService.cs
@@ -1,6 +1,4 @@
using Grand.Web.Admin.Models.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IAddressAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IAddressAttributeViewModelService.cs
index 00e30dff9..886ae42f2 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IAddressAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IAddressAttributeViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Common;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IAffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IAffiliateViewModelService.cs
index 6cec7ef2b..0f42fa749 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IAffiliateViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IAffiliateViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Affiliates;
using Grand.Web.Admin.Models.Affiliates;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IBlogViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IBlogViewModelService.cs
index 48a5c4452..ec1e719d8 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IBlogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IBlogViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Blogs;
using Grand.Web.Admin.Models.Blogs;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
index 865237eef..ffba03cce 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IBrandViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICampaignViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICampaignViewModelService.cs
index ab826bbcc..10275dcb2 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICampaignViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICampaignViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Messages;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs
index e7de7f490..9be94b048 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICheckoutAttributeViewModelService.cs
index 9da4fb828..57d1248df 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICheckoutAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICheckoutAttributeViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Orders;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICollectionViewModelService.cs
index 5968a03db..f5bd31fb7 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICollectionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICollectionViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IContactAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IContactAttributeViewModelService.cs
index 311543b25..1601ae479 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IContactAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IContactAttributeViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Messages;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IContactFormViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IContactFormViewModelService.cs
index 1607d5421..ef2fb1e2c 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IContactFormViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IContactFormViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Messages;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICountryViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICountryViewModelService.cs
index 867bddd72..65baf7c6a 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICountryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICountryViewModelService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Directory;
using Grand.Web.Admin.Models.Directory;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
index 4d5ecdee6..354187d69 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICourseViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Courses;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Courses;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICurrencyViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICurrencyViewModelService.cs
index 99c434f16..493917488 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICurrencyViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICurrencyViewModelService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Directory;
using Grand.Web.Admin.Models.Directory;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerActionViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerActionViewModelService.cs
index 1173f2993..46b102c90 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerActionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerActionViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerAttributeViewModelService.cs
index 198e8102c..c699e01d8 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerAttributeViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerGroupViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerGroupViewModelService.cs
index f6000908c..86e9ede6e 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerGroupViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerGroupViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
index ad3e0ed6f..9dc74d19d 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReportViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReportViewModelService.cs
index 19bab0f90..a0889ff3e 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReportViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReportViewModelService.cs
@@ -1,6 +1,4 @@
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerTagViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerTagViewModelService.cs
index 72a8c6537..f3aef43b9 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerTagViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerTagViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerViewModelService.cs
index 5f3b6e8d9..f84b49425 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerViewModelService.cs
@@ -6,8 +6,6 @@ using Grand.Web.Admin.Models.Common;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Models.Messages;
using Grand.Web.Admin.Models.ShoppingCart;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
index 236233dd8..24df16e0f 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Discounts;
using Grand.Domain.Vendors;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Discounts;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IDocumentViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IDocumentViewModelService.cs
index fc508405d..45c41da27 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IDocumentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IDocumentViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Documents;
using Grand.Web.Admin.Models.Documents;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IElFinderViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IElFinderViewModelService.cs
index 104dd6df9..93ab32201 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IElFinderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IElFinderViewModelService.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IEmailAccountViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IEmailAccountViewModelService.cs
index 0e8d43f0a..620542740 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IEmailAccountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IEmailAccountViewModelService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Messages;
using Grand.Web.Admin.Models.Messages;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs
index 9d34be755..280899ceb 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IGiftVoucherViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Orders;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IKnowledgebaseViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IKnowledgebaseViewModelService.cs
index a923f7ac9..d477f2563 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IKnowledgebaseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IKnowledgebaseViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Knowledgebase;
using Grand.Web.Admin.Models.Knowledgebase;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ILanguageViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ILanguageViewModelService.cs
index d3907dfd2..dc455349c 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ILanguageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ILanguageViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Localization;
using Grand.Web.Admin.Models.Localization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ILogViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ILogViewModelService.cs
index 42e751153..8609c6e62 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ILogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ILogViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Logging;
using Grand.Web.Admin.Models.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IMerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IMerchandiseReturnViewModelService.cs
index 7804dc44b..63b1f9e7f 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IMerchandiseReturnViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IMerchandiseReturnViewModelService.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Orders;
using Grand.Web.Admin.Models.Common;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/INewsViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/INewsViewModelService.cs
index 534f5f372..5befd82d8 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/INewsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/INewsViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.News;
using Grand.Web.Admin.Models.News;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
index cbb888869..2bb3b5112 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Orders;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IPageViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IPageViewModelService.cs
index 2cc6a89c8..9d951f6d8 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IPageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IPageViewModelService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Pages;
using Grand.Web.Admin.Models.Pages;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IPictureViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IPictureViewModelService.cs
index ad5ff6c8a..702c9ba90 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IPictureViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IPictureViewModelService.cs
@@ -1,5 +1,4 @@
using Grand.Web.Admin.Models.Common;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IProductReviewViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IProductReviewViewModelService.cs
index e07330b26..d90225bdc 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IProductReviewViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IProductReviewViewModelService.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
index 8a34af59f..a0085758f 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IShipmentViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IShipmentViewModelService.cs
index 5d7cc3747..3689048ad 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IShipmentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IShipmentViewModelService.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
index c42e96ee8..a8fa26461 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Stores;
using Grand.Web.Admin.Models.Stores;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IVendorViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IVendorViewModelService.cs
index d7a349cff..7a58ed8b7 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IVendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IVendorViewModelService.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Vendors;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Models.Vendors;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Interfaces
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/BlogCategoryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BlogCategoryProfile.cs
index 455e6996e..d075e6c6d 100644
--- a/src/Web/Grand.Web.Admin/Mapper/BlogCategoryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/BlogCategoryProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Blogs;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Blogs;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
index e9c14f12e..615951f98 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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
index fef908376..7697b77ab 100644
--- a/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
index a92d21acf..b9098eabc 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/CheckoutAttributeProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CheckoutAttributeProfile.cs
index 90be7b61b..ef49a8eeb 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CheckoutAttributeProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CheckoutAttributeProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Orders;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
index c743d0010..24015f995 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/ContactAttributeProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ContactAttributeProfile.cs
index f824af187..d0c501ceb 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ContactAttributeProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ContactAttributeProfile.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.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 d99e0981c..d9848e360 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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/CourseProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CourseProfile.cs
index fe97c3108..f0c9e67e0 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CourseProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CourseProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Courses;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Courses;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/CurrencyProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CurrencyProfile.cs
index b77494c50..dee9dd035 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CurrencyProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CurrencyProfile.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.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 307983a8e..a9727d2d0 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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/DocumentProfile.cs b/src/Web/Grand.Web.Admin/Mapper/DocumentProfile.cs
index ef5aed3e2..1848bced6 100644
--- a/src/Web/Grand.Web.Admin/Mapper/DocumentProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/DocumentProfile.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Documents;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Documents;
-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 d622ecb89..8f9b1a598 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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/LanguageProfile.cs b/src/Web/Grand.Web.Admin/Mapper/LanguageProfile.cs
index ae76e209c..33c2a64ef 100644
--- a/src/Web/Grand.Web.Admin/Mapper/LanguageProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/LanguageProfile.cs
@@ -1,7 +1,6 @@
using AutoMapper;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Localization;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/MessageTemplateProfile.cs b/src/Web/Grand.Web.Admin/Mapper/MessageTemplateProfile.cs
index 482a887f6..fd9791c80 100644
--- a/src/Web/Grand.Web.Admin/Mapper/MessageTemplateProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/MessageTemplateProfile.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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs b/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
index ec93f8139..9c6d593c6 100644
--- a/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.News;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.News;
-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 deaff5f48..8ff61d010 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.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
index 4874ce13d..806d57f6d 100644
--- a/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Pages;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Pages;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/ProductAttributeProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ProductAttributeProfile.cs
index 681d07f25..881a5ad26 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ProductAttributeProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ProductAttributeProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
index c84c1efb6..7346efb73 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Mapper/SpecificationAttributeProfile.cs b/src/Web/Grand.Web.Admin/Mapper/SpecificationAttributeProfile.cs
index 291019c7a..8b1becefd 100644
--- a/src/Web/Grand.Web.Admin/Mapper/SpecificationAttributeProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/SpecificationAttributeProfile.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Linq;
namespace Grand.Web.Admin.Mapper
{
diff --git a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateListModel.cs b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateListModel.cs
index 7fd7d7194..f0a330257 100644
--- a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateListModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Affiliates
diff --git a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateModel.cs b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateModel.cs
index 1d49018e7..9d4dafb02 100644
--- a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliateModel.cs
@@ -1,5 +1,4 @@
-using System;
-using Grand.Web.Admin.Models.Common;
+using Grand.Web.Admin.Models.Common;
using Grand.Infrastructure.Models;
using Grand.Infrastructure.ModelBinding;
diff --git a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliatedOrderListModel.cs b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliatedOrderListModel.cs
index 8d5b46f79..5b16eb5f3 100644
--- a/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliatedOrderListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Affiliates/AffiliatedOrderListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Affiliates
diff --git a/src/Web/Grand.Web.Admin/Models/Blogs/BlogCategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Blogs/BlogCategoryModel.cs
index 4ef82704b..cc73f2f6d 100644
--- a/src/Web/Grand.Web.Admin/Models/Blogs/BlogCategoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Blogs/BlogCategoryModel.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Blogs
diff --git a/src/Web/Grand.Web.Admin/Models/Blogs/BlogCommentModel.cs b/src/Web/Grand.Web.Admin/Models/Blogs/BlogCommentModel.cs
index 77b87d661..cfc19f0ea 100644
--- a/src/Web/Grand.Web.Admin/Models/Blogs/BlogCommentModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Blogs/BlogCommentModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Blogs
{
diff --git a/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs b/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
index 3be614d95..eb7032c5a 100644
--- a/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Blogs/BlogPostModel.cs
@@ -1,8 +1,6 @@
using Grand.Web.Common.Link;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Grand.Web.Common.Models;
diff --git a/src/Web/Grand.Web.Admin/Models/Blogs/BlogProductModel.cs b/src/Web/Grand.Web.Admin/Models/Blogs/BlogProductModel.cs
index 5e26fe875..7523a2f75 100644
--- a/src/Web/Grand.Web.Admin/Models/Blogs/BlogProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Blogs/BlogProductModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Blogs
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/BrandListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/BrandListModel.cs
index 8823ea1f9..a5ff276de 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/BrandListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/BrandListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs
index 5a63a136e..ddd9265b1 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs
@@ -4,8 +4,6 @@ using Grand.Web.Admin.Models.Discounts;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/BulkEditListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/BulkEditListModel.cs
index c3ebdf156..f8f0d1e1d 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/BulkEditListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/BulkEditListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryListModel.cs
index 7a9f7562e..fa7517a5b 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs
index 9aaa4de4b..d55fdca28 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs
@@ -4,8 +4,6 @@ using Grand.Web.Admin.Models.Discounts;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionListModel.cs
index 4dd3aacb4..38808e12f 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs
index a460980f9..83e017a5c 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs
@@ -4,8 +4,6 @@ using Grand.Web.Admin.Models.Discounts;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeCombinationModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeCombinationModel.cs
index b2d9445b3..43ea1c333 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeCombinationModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeCombinationModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeConditionModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeConditionModel.cs
index 7fa012bd1..183018a15 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeConditionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeConditionModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
index 677b8ff44..6e70c3c10 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductAttributeModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using System.ComponentModel.DataAnnotations;
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductListModel.cs
index 7e06d0462..e0d91a664 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
index 671f6fab9..5ca6793f6 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Discounts;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewListModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewListModel.cs
index 7cbcb4659..bcc132917 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs
index 003dbc0ae..e7cf9c25c 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductTagModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductTagModel.cs
index 119323beb..8274c937c 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductTagModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductTagModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeModel.cs
index c552bedbc..ce837c5c0 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Catalog
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeOptionModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeOptionModel.cs
index ff8bce492..c61c95334 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeOptionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/SpecificationAttributeOptionModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeModel.cs
index 3b57feb42..0001950ee 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeValueModel.cs b/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeValueModel.cs
index 058e52844..30b76175b 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeValueModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/AddressAttributeValueModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs b/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
index 0f21e0164..cc6d87e95 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Common;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/LanguageSelectorModel.cs b/src/Web/Grand.Web.Admin/Models/Common/LanguageSelectorModel.cs
index aa2dd726f..1cb26d08d 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/LanguageSelectorModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/LanguageSelectorModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Localization;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs b/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs
index 72d6b7675..74a72aaff 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Common
diff --git a/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs b/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
index 5d2236261..643960891 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/SystemInfoModel.cs b/src/Web/Grand.Web.Admin/Models/Common/SystemInfoModel.cs
index 7e2645847..be29c0db2 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/SystemInfoModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/SystemInfoModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Common/UrlEntityListModel.cs b/src/Web/Grand.Web.Admin/Models/Common/UrlEntityListModel.cs
index 277a204d4..d1a9ead98 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/UrlEntityListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/UrlEntityListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Common
{
diff --git a/src/Web/Grand.Web.Admin/Models/Courses/CourseLessonModel.cs b/src/Web/Grand.Web.Admin/Models/Courses/CourseLessonModel.cs
index b39398537..c10837fdd 100644
--- a/src/Web/Grand.Web.Admin/Models/Courses/CourseLessonModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Courses/CourseLessonModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Courses
diff --git a/src/Web/Grand.Web.Admin/Models/Courses/CourseModel.cs b/src/Web/Grand.Web.Admin/Models/Courses/CourseModel.cs
index 02f420d48..eb16009bb 100644
--- a/src/Web/Grand.Web.Admin/Models/Courses/CourseModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Courses/CourseModel.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Courses
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/BestCustomersReportModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/BestCustomersReportModel.cs
index 11868cf87..0ed41289a 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/BestCustomersReportModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/BestCustomersReportModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionConditionModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionConditionModel.cs
index b380950ee..40d89bfa6 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionConditionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionConditionModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionModel.cs
index f71723c5d..f614e65c1 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerActionModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeModel.cs
index a9e043c6e..e87b5ab92 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeValueModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeValueModel.cs
index f7e057274..9c19bf886 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeValueModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerAttributeValueModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupPermissionModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupPermissionModel.cs
index 5e091c3d9..7bb14a2b0 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupPermissionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupPermissionModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupProductModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupProductModel.cs
index ab0ea8934..a81979c5f 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupProductModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerListModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerListModel.cs
index 1b50f8bc9..4eff84854 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerModel.cs
index aece454de..1e2f89353 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Grand.Web.Common.Models;
using Grand.Domain.Common;
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerReminderModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerReminderModel.cs
index 4531084aa..a3300aee3 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerReminderModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerReminderModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerTagProductModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerTagProductModel.cs
index 318b3edbd..72a6c15c1 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/CustomerTagProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerTagProductModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/OnlineCustomerModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/OnlineCustomerModel.cs
index c71d2d5b3..514aef423 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/OnlineCustomerModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/OnlineCustomerModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerActionHistory.cs b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerActionHistory.cs
index e3fe62fb5..923c491e8 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerActionHistory.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerActionHistory.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Web.Admin.Models.Customers
+namespace Grand.Web.Admin.Models.Customers
{
public class SerializeCustomerActionHistory
{
diff --git a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
index 9712be544..366d98bca 100644
--- a/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Customers/SerializeCustomerReminderHistoryModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Web.Admin.Models.Customers
+namespace Grand.Web.Admin.Models.Customers
{
public class SerializeCustomerReminderHistoryModel
{
diff --git a/src/Web/Grand.Web.Admin/Models/Directory/CountryModel.cs b/src/Web/Grand.Web.Admin/Models/Directory/CountryModel.cs
index 7196c9553..9dffe9453 100644
--- a/src/Web/Grand.Web.Admin/Models/Directory/CountryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Directory/CountryModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Directory
diff --git a/src/Web/Grand.Web.Admin/Models/Directory/CurrencyModel.cs b/src/Web/Grand.Web.Admin/Models/Directory/CurrencyModel.cs
index 18f2af401..3d15eaf8d 100644
--- a/src/Web/Grand.Web.Admin/Models/Directory/CurrencyModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Directory/CurrencyModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Directory
diff --git a/src/Web/Grand.Web.Admin/Models/Directory/StateProvinceModel.cs b/src/Web/Grand.Web.Admin/Models/Directory/StateProvinceModel.cs
index 3aad539b4..890b68258 100644
--- a/src/Web/Grand.Web.Admin/Models/Directory/StateProvinceModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Directory/StateProvinceModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Models/Discounts/DiscountListModel.cs b/src/Web/Grand.Web.Admin/Models/Discounts/DiscountListModel.cs
index d3c410f79..80f1b78ef 100644
--- a/src/Web/Grand.Web.Admin/Models/Discounts/DiscountListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Discounts/DiscountListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Discounts
{
diff --git a/src/Web/Grand.Web.Admin/Models/Discounts/DiscountModel.cs b/src/Web/Grand.Web.Admin/Models/Discounts/DiscountModel.cs
index 05de4abe4..bcbb9c42e 100644
--- a/src/Web/Grand.Web.Admin/Models/Discounts/DiscountModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Discounts/DiscountModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Discounts
diff --git a/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs b/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
index 2e8a1b3f3..8ceeaf540 100644
--- a/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Documents/DocumentModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Documents
diff --git a/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseArticleModel.cs b/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseArticleModel.cs
index 9bf008991..9b4bd4f81 100644
--- a/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseArticleModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseArticleModel.cs
@@ -3,8 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Knowledgebase
diff --git a/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseCategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
index 2b3307e23..51b788bea 100644
--- a/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
@@ -3,8 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Knowledgebase
diff --git a/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs b/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
index eace287fc..9b54f08d4 100644
--- a/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Localization/LanguageModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Localization
diff --git a/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogModel.cs b/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogModel.cs
index 191e3da08..3d983b542 100644
--- a/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Logging
{
diff --git a/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogSearchModel.cs b/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogSearchModel.cs
index f15ad92d7..56dda6dad 100644
--- a/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogSearchModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Logging/ActivityLogSearchModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Logging
diff --git a/src/Web/Grand.Web.Admin/Models/Logging/LogListModel.cs b/src/Web/Grand.Web.Admin/Models/Logging/LogListModel.cs
index 0353e386a..93fcf6558 100644
--- a/src/Web/Grand.Web.Admin/Models/Logging/LogListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Logging/LogListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Logging
diff --git a/src/Web/Grand.Web.Admin/Models/Logging/LogModel.cs b/src/Web/Grand.Web.Admin/Models/Logging/LogModel.cs
index 46a421a12..28e259ff0 100644
--- a/src/Web/Grand.Web.Admin/Models/Logging/LogModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Logging/LogModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Logging
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/BannerModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/BannerModel.cs
index 2b9780559..e8bd36cfe 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/BannerModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/BannerModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/CampaignModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/CampaignModel.cs
index 80ca262a2..4c4c0e192 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/CampaignModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/CampaignModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeModel.cs
index 9df4f64a3..c8e1c84a2 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeModel.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeValueModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeValueModel.cs
index d250b742e..9e251e353 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeValueModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/ContactAttributeValueModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/ContactFormListModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/ContactFormListModel.cs
index 5b28c30c5..7f23f18d6 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/ContactFormListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/ContactFormListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/ContactFormModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/ContactFormModel.cs
index 980767d26..945a9c3b3 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/ContactFormModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/ContactFormModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeModel.cs
index 25f7fcc81..66e3046a4 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeValueModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeValueModel.cs
index 0d1df8255..a6b8f7fad 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeValueModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormAttributeValueModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
index 7a301f5c2..0ce3b292a 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/InteractiveFormModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateListModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateListModel.cs
index 765e7f125..b1953f0ba 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateModel.cs
index deb0f37f2..bef8f4e4a 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/MessageTemplateModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/NewsLetterSubscriptionListModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/NewsLetterSubscriptionListModel.cs
index 0aa1aa839..cf337b480 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/NewsLetterSubscriptionListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/NewsLetterSubscriptionListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
index ecfa3b5e1..dc8479320 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/NewsletterCategoryModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Link;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
using Grand.Web.Common.Models;
using System.ComponentModel.DataAnnotations;
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailListModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailListModel.cs
index 427f3a6ce..ea67c6e7c 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailListModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailModel.cs b/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailModel.cs
index f45984b22..6fae4f36a 100644
--- a/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Messages/QueuedEmailModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Common;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Messages
diff --git a/src/Web/Grand.Web.Admin/Models/News/NewsCommentModel.cs b/src/Web/Grand.Web.Admin/Models/News/NewsCommentModel.cs
index 3d5e65ee4..5740b0a2a 100644
--- a/src/Web/Grand.Web.Admin/Models/News/NewsCommentModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/News/NewsCommentModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.News
{
diff --git a/src/Web/Grand.Web.Admin/Models/News/NewsItemListModel.cs b/src/Web/Grand.Web.Admin/Models/News/NewsItemListModel.cs
index f8f7b885c..04e23924b 100644
--- a/src/Web/Grand.Web.Admin/Models/News/NewsItemListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/News/NewsItemListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.News
{
diff --git a/src/Web/Grand.Web.Admin/Models/News/NewsItemModel.cs b/src/Web/Grand.Web.Admin/Models/News/NewsItemModel.cs
index 724b0da57..645c997c4 100644
--- a/src/Web/Grand.Web.Admin/Models/News/NewsItemModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/News/NewsItemModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.News
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/BestsellersReportModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/BestsellersReportModel.cs
index 674ba9fe3..b12c2ccc2 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/BestsellersReportModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/BestsellersReportModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeModel.cs
index 438bea53d..0ec2e461f 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeModel.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeValueModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeValueModel.cs
index 2792879d9..233823d1d 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeValueModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/CheckoutAttributeValueModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/CountryReportModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/CountryReportModel.cs
index 7f5fb0823..6846bbef7 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/CountryReportModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/CountryReportModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherListModel.cs
index 7ec55fc77..2e185c952 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs
index 79bf6024c..c0916439a 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/GiftVoucherModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnListModel.cs
index dc2c9ed38..822933e03 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs
index 71159e593..b9d3b94f9 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Common;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/NeverSoldReportModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/NeverSoldReportModel.cs
index eb8791d05..71071b5de 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/NeverSoldReportModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/NeverSoldReportModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
index 28e03ed19..8734cf069 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
index 861365343..62439d6a5 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderTagModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderTagModel.cs
index 3dd6323c8..185ccd44d 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderTagModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderTagModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionListModel.cs
index 09aaa6634..dd5bd6adf 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionModel.cs
index c0d1529d6..36a7a8335 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/PaymentTransactionModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Payments;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/ShipmentListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/ShipmentListModel.cs
index 5aa85b53a..e2deead5b 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/ShipmentListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/ShipmentListModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/ShipmentModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/ShipmentModel.cs
index 2011db12c..8615d9262 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/ShipmentModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/ShipmentModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Orders
diff --git a/src/Web/Grand.Web.Admin/Models/Pages/PageListModel.cs b/src/Web/Grand.Web.Admin/Models/Pages/PageListModel.cs
index 2ca928ba2..27f05d219 100644
--- a/src/Web/Grand.Web.Admin/Models/Pages/PageListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Pages/PageListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Pages
{
diff --git a/src/Web/Grand.Web.Admin/Models/Pages/PageModel.cs b/src/Web/Grand.Web.Admin/Models/Pages/PageModel.cs
index c8910a7da..b97c834ee 100644
--- a/src/Web/Grand.Web.Admin/Models/Pages/PageModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Pages/PageModel.cs
@@ -3,8 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Pages
diff --git a/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs b/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
index a5c2240e8..b2cafe579 100644
--- a/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Payments/PaymentMethodRestrictionModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Directory;
using Grand.Web.Admin.Models.Shipping;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Payments
{
diff --git a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionActionModel.cs b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionActionModel.cs
index e19c4b546..b1895c675 100644
--- a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionActionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionActionModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Permissions
{
diff --git a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionMappingModel.cs b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionMappingModel.cs
index 9c186f1f3..be5992ade 100644
--- a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionMappingModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionMappingModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Permissions
{
diff --git a/src/Web/Grand.Web.Admin/Models/Plugins/OfficialFeedListModel.cs b/src/Web/Grand.Web.Admin/Models/Plugins/OfficialFeedListModel.cs
index c5c543873..4fc47bc76 100644
--- a/src/Web/Grand.Web.Admin/Models/Plugins/OfficialFeedListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Plugins/OfficialFeedListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Plugins
{
diff --git a/src/Web/Grand.Web.Admin/Models/Plugins/PluginListModel.cs b/src/Web/Grand.Web.Admin/Models/Plugins/PluginListModel.cs
index 76457a2df..18890dc67 100644
--- a/src/Web/Grand.Web.Admin/Models/Plugins/PluginListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Plugins/PluginListModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Plugins
{
diff --git a/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs b/src/Web/Grand.Web.Admin/Models/PushNotifications/PushMessageGridModel.cs
index 43c292f68..fbab535f6 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.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 22759f513..449cda353 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.Domain;
-using System;
namespace Grand.Web.Admin.Models.PushNotifications
{
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs
index 539b33e81..97c82f07c 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
index 7159b1911..e58e21d35 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Security.Captcha;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Settings
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnActionModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnActionModel.cs
index 9d695dd72..dc67cc499 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnActionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnActionModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnReasonModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnReasonModel.cs
index 5d2a621cf..cd8098679 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnReasonModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/MerchandiseReturnReasonModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs
index 7c5a8a6a8..d84872e31 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/SalesSettingsModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/StoreScopeModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/StoreScopeModel.cs
index af44439c6..30a8467c8 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/StoreScopeModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/StoreScopeModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/DeliveryDateModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/DeliveryDateModel.cs
index 8d5de5d28..0520bfc23 100644
--- a/src/Web/Grand.Web.Admin/Models/Shipping/DeliveryDateModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Shipping/DeliveryDateModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/PickupPointModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/PickupPointModel.cs
index 0bdf56364..f48baa87e 100644
--- a/src/Web/Grand.Web.Admin/Models/Shipping/PickupPointModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Shipping/PickupPointModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodModel.cs
index 11beea311..f9ddd962a 100644
--- a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodModel.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Models;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodRestrictionModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodRestrictionModel.cs
index bbae437c1..5a41091cc 100644
--- a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodRestrictionModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingMethodRestrictionModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Common.Models;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Models/ShoppingCart/ShoppingCartItemModel.cs b/src/Web/Grand.Web.Admin/Models/ShoppingCart/ShoppingCartItemModel.cs
index 198d9a646..3293746f7 100644
--- a/src/Web/Grand.Web.Admin/Models/ShoppingCart/ShoppingCartItemModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/ShoppingCart/ShoppingCartItemModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs b/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
index f749ca542..f3887083c 100644
--- a/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Stores
{
diff --git a/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs b/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
index f235491ed..2b5d4ea85 100644
--- a/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Tasks
{
diff --git a/src/Web/Grand.Web.Admin/Models/Tax/TaxSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Tax/TaxSettingsModel.cs
index ee5d86735..777069450 100644
--- a/src/Web/Grand.Web.Admin/Models/Tax/TaxSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Tax/TaxSettingsModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Models.Tax
{
diff --git a/src/Web/Grand.Web.Admin/Models/Vendors/VendorModel.cs b/src/Web/Grand.Web.Admin/Models/Vendors/VendorModel.cs
index 49a04b609..9eaf2eb40 100644
--- a/src/Web/Grand.Web.Admin/Models/Vendors/VendorModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Vendors/VendorModel.cs
@@ -4,8 +4,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Admin.Models.Common;
using Grand.Web.Admin.Models.Discounts;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Vendors
diff --git a/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewListModel.cs b/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewListModel.cs
index bcacfdb5f..aea2fc0b9 100644
--- a/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewListModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Admin.Models.Customers
diff --git a/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewModel.cs b/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewModel.cs
index 6a2b00904..80763ffb6 100644
--- a/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Vendors/VendorReviewModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Admin.Models.Vendors
{
diff --git a/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
index 451de684d..4dac6ccc5 100644
--- a/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
@@ -9,10 +9,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
index a210263e0..56f2c85ce 100644
--- a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
@@ -6,9 +6,6 @@ using Grand.Domain.Common;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
index aa51e90b2..cc0ab7052 100644
--- a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
@@ -15,10 +15,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Affiliates;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
index 815e34979..f7b49f9ed 100644
--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
@@ -18,10 +18,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Blogs;
using Grand.Web.Admin.Models.Catalog;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
index 3b515df0c..1e58c86d1 100644
--- a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
@@ -17,10 +17,6 @@ using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
index d4f896bf4..b38f1f20f 100644
--- a/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
@@ -11,11 +11,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
index 4615f72b8..b005ca5a0 100644
--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
@@ -19,10 +19,6 @@ using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
index 02f3e5c75..bf1057ab8 100644
--- a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
@@ -14,10 +14,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
index ac71e5aae..896b875a2 100644
--- a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
@@ -19,10 +19,6 @@ using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
index 6d85668f0..dd2e72b93 100644
--- a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
@@ -11,10 +11,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
index 90fbd0c28..47cb4881e 100644
--- a/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
@@ -9,9 +9,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
index 78f289809..d9fcea8ca 100644
--- a/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Directory;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Directory;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
index f174cb547..aaed08d2e 100644
--- a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
@@ -20,10 +20,6 @@ using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
index eb43b61e3..0b5c018f9 100644
--- a/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Directory;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
index 33d96f5f8..717d3a345 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
@@ -18,10 +18,6 @@ using Grand.Web.Admin.Models.Customers;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
index bc97edb0c..b76e17a4a 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
@@ -5,10 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
index 2b6a60581..4187efd29 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
@@ -14,9 +14,6 @@ using Grand.Web.Admin.Models.Customers;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
index 66cc58bcc..427b31ca1 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
@@ -18,10 +18,6 @@ using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
index c91a5395c..66c085cec 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
@@ -8,10 +8,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.System.Interfaces.Reports;
using Grand.Business.Catalog.Interfaces.Prices;
using Grand.Business.Checkout.Interfaces.Orders;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
index 00fcc9555..f0cfb4243 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
@@ -15,9 +15,6 @@ using Grand.Web.Admin.Models.Customers;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
index 8f253d023..28519f147 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
@@ -36,12 +36,7 @@ using Grand.Web.Common.Extensions;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
index a66c19bcd..7c687a019 100644
--- a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
@@ -22,10 +22,6 @@ using Grand.Web.Admin.Models.Discounts;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
index d6f38c9e7..dd7399a91 100644
--- a/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
@@ -16,10 +16,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Documents;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
index 2b947470b..3a364db5d 100644
--- a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
@@ -8,10 +8,6 @@ using Grand.Web.Admin.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
index 6135cebbc..54bad62f0 100644
--- a/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Messages;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
index 4b8a3f5e1..0c3fe5b8c 100644
--- a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
@@ -12,10 +12,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Grand.Business.Common.Interfaces.Stores;
diff --git a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
index 07f9ba8be..b81852730 100644
--- a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
@@ -14,10 +14,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Knowledgebase;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
index b3716ab21..05b6313c4 100644
--- a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
@@ -5,11 +5,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Localization;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.SharedKernel.Extensions;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
index 44bfc1ece..8a77b8880 100644
--- a/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
@@ -9,10 +9,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
index 14a8ac09c..2b22e373d 100644
--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
@@ -19,10 +19,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
namespace Grand.Web.Admin.Services
diff --git a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
index ce93c22a5..715786bb3 100644
--- a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
@@ -13,10 +13,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.News;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 5e52629f9..ce489fa8f 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -37,11 +37,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
index a5b1f2083..20dcd4b59 100644
--- a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
@@ -11,8 +11,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Pages;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Threading.Tasks;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
index 808f82066..72bad078b 100644
--- a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
@@ -4,8 +4,6 @@ using Grand.Business.Storage.Interfaces;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
index 6a8ff35a5..a680a6b73 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
@@ -13,10 +13,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index 0f2808d0d..cf15d07dc 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -32,11 +32,6 @@ using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
index 7f674cf1e..9cdf8a247 100644
--- a/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
@@ -18,10 +18,6 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
index 99224da01..b1a03bf36 100644
--- a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
@@ -8,9 +8,6 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Stores;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
index 8b2968559..d0f1972c9 100644
--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
@@ -19,10 +19,6 @@ using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Models.Vendors;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
index 7ec0c351d..72c853ddf 100644
--- a/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
@@ -1,7 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
-using System.Collections.Generic;
using Grand.Web.Admin.Models.Affiliates;
namespace Grand.Web.Admin.Validators.Blogs
diff --git a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
index f6eb2f2e9..1af5938e7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Blogs;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Blogs
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
index f5a345d9d..d9055f193 100644
--- a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Blogs;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Blogs
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
index 190dcb576..70fb8aa8e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
using Grand.Business.Catalog.Interfaces.Products;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
index b2419fb31..3fa3283b3 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
index fcaf957a3..58d6c856d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
index 058ffc50b..3241db7ea 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
index 234eb6a8f..1933206e3 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
index 6b42c3aad..054ce8107 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
@@ -5,8 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
index bd0afa932..aa78a0058 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
index d749bd224..fc175ca6f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
index 0359675c3..ea33d8075 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
index 4db42970d..338c1bad7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
index 383accef6..8712c719f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
index c7f90b9d8..003703fcc 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
index b54616584..58b445a51 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
index 912a481d9..d058cca63 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
index a855f9efe..5cc5a843b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
index 5051f55a4..551bb7bcc 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
@@ -4,7 +4,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
using Grand.Business.Catalog.Interfaces.Products;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
index 852ae153c..3f49b9c5e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
index b1152485e..9818ff8a7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
index b9bb89b72..8c2a63e14 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
index 98c25a517..b5fb6d976 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
@@ -6,7 +6,6 @@ using Grand.Infrastructure.Validators;
using Grand.Domain.Catalog;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
index da3d2d164..e356588f5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
index 14d0a3679..03bb01f1d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
index 14376d964..a9017b71e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
index 62d3e5715..447fde6d8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
index 3f6a92a43..11e95e35e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
index 2bedf1af7..3356af2d6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
index 78689f636..937cb4edb 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
index 081dbefa0..cfac7d3d2 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
index 9529193aa..87805b1b8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
index 37f886dc4..18a7f162d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
index 748547ba8..6c791315c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
index 2086f2ae3..89217403e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
index 7ca1af571..28a497ac4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
index eda43e0fa..26b3c5ca6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
index 2f3607283..bf4b25ecc 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
index 242741721..3b1a0fb3e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
index 8f0caa2f4..93685c7ba 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
index 38b9650a6..976724f63 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Common
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
index 3c2e03b24..7e2cc5abc 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Courses;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Courses
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
index 6f4cf857d..18f6be93d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Courses;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Courses
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
index 5e94e0ff0..528953fca 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Courses;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Courses
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
index d139c3b96..c094113ce 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Courses;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Courses
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
index 89e12eb61..a9dc7cefe 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
index 8895fb8ea..2d06436f1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
index 9ba86532b..788607bf4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
index c7b0712e6..b57f0fd1d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
index e5691c3dd..0101cf967 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
index 425d78669..bfd543d6c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
index 8e92319f2..7ef8ffc1e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
index c3892075c..c1ad56bda 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
index 70a84f3d0..110df5934 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
@@ -4,8 +4,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
index b54c2f706..ca657622b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
index 7cfb6727b..64857b6a5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Customers.Interfaces;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Customers;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Customers
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
index d9714d96a..e8c94084e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
index 954c5a31b..b4110e20c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System;
-using System.Collections.Generic;
using System.Globalization;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
index d37f5064f..83cf1a12f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
index cccbbdc9a..92b88687a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
index 2b598d386..c64dcd324 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
index 0f820b98b..439968dcd 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
index a274aa0a5..1ff5fa001 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Directory;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Directory
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs b/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
index 407324990..5afc188db 100644
--- a/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Discounts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Discounts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
index 7fb79dcec..37e69ca4a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Documents;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Documents
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
index ef36aa6b5..f8e05230f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Documents;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Documents
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
index c4705265a..8d5046651 100644
--- a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Knowledgebase;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Knowledgebase
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
index d2f533db9..38677105c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
@@ -3,7 +3,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Knowledgebase;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Knowledgebase
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
index a5bac79ac..ed2f7c7a8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Layouts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Layouts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
index f795a1489..38c9305e5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Layouts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Layouts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
index ecb659d81..bb3417400 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Layouts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Layouts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
index 5b433bec4..940b2b5eb 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Layouts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Layouts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
index dd1871188..c657419f8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Layouts;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Layouts
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
index 06b2c82ae..a8bc78568 100644
--- a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Localization;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Localization
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
index 1b3fb26ea..d004d5ad1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Localization;
-using System.Collections.Generic;
using System.Globalization;
namespace Grand.Web.Admin.Validators.Localization
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
index 5ad11bcfa..4a36f2951 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
index 0d4dccfe2..1f99c5653 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
index d790db41a..40b801918 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
index 4c0eb13bc..a8b402e4b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
index e91f8d6c3..441432dde 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
index c205519c4..88bef058f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
index 25e316132..f0994e2b9 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
index 5e7181773..bcbc7c2b5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
index 975a9b3a6..b975a5761 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
index 68ea63b30..04d56edef 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
index 5ac4a7f8d..b13e922ce 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
index e9d84d859..547eee12e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Messages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Messages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs b/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
index 705244a5f..a1b6c6a21 100644
--- a/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.News;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.News
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
index a0d369245..e7f007080 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
index 3a49ec2a2..43dafa51a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
index 3c04d9023..aa012f30d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
index 1ffc163b5..806842904 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
@@ -2,7 +2,6 @@
using Grand.Business.Common.Interfaces.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Orders;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Orders
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs b/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
index a0cbbab34..5c0de1795 100644
--- a/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Pages;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Pages
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs b/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
index fc07b33a1..1584503b6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Plugins;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Plugins
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
index d4b95ec4f..10690d55f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Settings;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
index aa4e188e0..0a101a4db 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Settings;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
index 1b282ea64..df4fe3867 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Settings;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
index 961ad65f8..aebaae66a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Orders;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Settings;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
index 7e4420ffe..d26fb9f4e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Settings;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Settings
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
index 44504e499..0a36aa489 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Shipping;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
index b473f5ae7..f4bcec71f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Shipping;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
index ff9e048d0..cdacdc893 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Shipping;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
index 717314321..4546cf4cc 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Shipping;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Shipping
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
index f911515ab..7716c101c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Stores;
-using System.Collections.Generic;
-using System;
namespace Grand.Web.Admin.Validators.Stores
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs b/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
index 84e303a14..7ffa7f090 100644
--- a/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Stores;
-using System.Collections.Generic;
-using System;
namespace Grand.Web.Admin.Validators.Stores
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Tasks/ScheduleTaskValidator.cs b/src/Web/Grand.Web.Admin/Validators/Tasks/ScheduleTaskValidator.cs
index c8b79bc65..b2173978f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Tasks/ScheduleTaskValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Tasks/ScheduleTaskValidator.cs
@@ -1,7 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Tasks;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Tasks
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
index 6df5c88e3..6e4e7396e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Tax;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Tax
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
index e8fc0a4ae..4f82cbec7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Vendors;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Vendors
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
index 7fd39e3a4..4ac373a89 100644
--- a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Admin.Models.Vendors;
using Grand.Web.Admin.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Admin.Validators.Vendors
{
diff --git a/src/Web/Grand.Web.Common/Components/BaseViewComponentAttribute.cs b/src/Web/Grand.Web.Common/Components/BaseViewComponentAttribute.cs
index 235383c35..ab37cb11b 100644
--- a/src/Web/Grand.Web.Common/Components/BaseViewComponentAttribute.cs
+++ b/src/Web/Grand.Web.Common/Components/BaseViewComponentAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Grand.Web.Common.Components
+namespace Grand.Web.Common.Components
{
public class BaseViewComponentAttribute : Attribute
{
diff --git a/src/Web/Grand.Web.Common/Components/JsonContentViewComponentResult.cs b/src/Web/Grand.Web.Common/Components/JsonContentViewComponentResult.cs
index 90c5bf572..6a3e1b1d4 100644
--- a/src/Web/Grand.Web.Common/Components/JsonContentViewComponentResult.cs
+++ b/src/Web/Grand.Web.Common/Components/JsonContentViewComponentResult.cs
@@ -4,8 +4,6 @@
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewComponents;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Components
{
diff --git a/src/Web/Grand.Web.Common/Controllers/BaseController.cs b/src/Web/Grand.Web.Common/Controllers/BaseController.cs
index a994bd190..734ea988c 100644
--- a/src/Web/Grand.Web.Common/Controllers/BaseController.cs
+++ b/src/Web/Grand.Web.Common/Controllers/BaseController.cs
@@ -14,9 +14,6 @@ using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Controllers
{
diff --git a/src/Web/Grand.Web.Common/Controllers/ControllerExtensions.cs b/src/Web/Grand.Web.Common/Controllers/ControllerExtensions.cs
index b4cc8a71f..baa19e80e 100644
--- a/src/Web/Grand.Web.Common/Controllers/ControllerExtensions.cs
+++ b/src/Web/Grand.Web.Common/Controllers/ControllerExtensions.cs
@@ -2,8 +2,6 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Controllers
{
diff --git a/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs b/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
index a284af5e3..27990ab8e 100644
--- a/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
+++ b/src/Web/Grand.Web.Common/Events/AdminTabStripCreated.cs
@@ -1,6 +1,5 @@
using MediatR;
using Microsoft.AspNetCore.Html;
-using System.Collections.Generic;
namespace Grand.Web.Common.Events
{
diff --git a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
index 2f23f798e..800dac668 100644
--- a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
+++ b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
@@ -5,9 +5,6 @@ using Grand.Web.Common.DataSource;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
namespace Grand.Web.Common.Extensions
diff --git a/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs b/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
index 46afd019a..1d9a71734 100644
--- a/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
+++ b/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Html;
-using System.IO;
using System.Text.Encodings.Web;
namespace Grand.Web.Common.Extensions
diff --git a/src/Web/Grand.Web.Common/Extensions/ModelStateExtensions.cs b/src/Web/Grand.Web.Common/Extensions/ModelStateExtensions.cs
index ff8f6ad29..c9cc02782 100644
--- a/src/Web/Grand.Web.Common/Extensions/ModelStateExtensions.cs
+++ b/src/Web/Grand.Web.Common/Extensions/ModelStateExtensions.cs
@@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Common.Extensions
{
diff --git a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
index 8b6f7a200..79596d49a 100644
--- a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/ArgumentNameFilterAttribute.cs b/src/Web/Grand.Web.Common/Filters/ArgumentNameFilterAttribute.cs
index 673b6f8e2..84a3b7006 100644
--- a/src/Web/Grand.Web.Common/Filters/ArgumentNameFilterAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/ArgumentNameFilterAttribute.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Mvc.Filters;
-using System.Linq;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
index 8fa031e5e..5651945e5 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Security;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
index 9536d95fc..6c9543de9 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
@@ -3,9 +3,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
index 4adecc0b8..319d54752 100644
--- a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
@@ -8,9 +8,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
index 28523e4ba..a4cb86d67 100644
--- a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
@@ -12,8 +12,6 @@ using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
index 284cce063..7709d89e6 100644
--- a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
@@ -7,10 +7,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
-using System;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
index 920dc5215..9c29661a6 100644
--- a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
@@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
index 796e7b959..e5f43a3d7 100644
--- a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Stores;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs b/src/Web/Grand.Web.Common/Filters/ValidateCaptchaAttribute.cs
index 4faa9da05..f117f41a4 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.Threading.Tasks;
namespace Grand.Web.Common.Filters
{
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
index 29d9a20cd..89c182fe3 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
@@ -21,9 +21,6 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Hosting;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
using WebMarkupMin.AspNetCore6;
namespace Grand.Web.Common.Infrastructure
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index f9dfaccb0..5ca1fc436 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -10,7 +10,6 @@ using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearchers;
using Grand.SharedKernel.Extensions;
-using Grand.Web.Common.Extensions;
using Grand.Web.Common.Themes;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
@@ -22,11 +21,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.WebEncoders;
using Newtonsoft.Json.Serialization;
using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.IO;
using System.IO.Compression;
-using System.Linq;
using System.Text.Encodings.Web;
using System.Text.Unicode;
using WebMarkupMin.AspNet.Common.Compressors;
diff --git a/src/Web/Grand.Web.Common/Menu/IAdminMenuProvider.cs b/src/Web/Grand.Web.Common/Menu/IAdminMenuProvider.cs
index 839fa93b7..86db5ab1e 100644
--- a/src/Web/Grand.Web.Common/Menu/IAdminMenuProvider.cs
+++ b/src/Web/Grand.Web.Common/Menu/IAdminMenuProvider.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Plugins;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Menu
{
diff --git a/src/Web/Grand.Web.Common/Menu/SiteMap.cs b/src/Web/Grand.Web.Common/Menu/SiteMap.cs
index 5d7972e83..599b11880 100644
--- a/src/Web/Grand.Web.Common/Menu/SiteMap.cs
+++ b/src/Web/Grand.Web.Common/Menu/SiteMap.cs
@@ -1,9 +1,6 @@
using Grand.Business.Common.Interfaces.Security;
using Grand.Business.System.Interfaces.Admin;
using Grand.Domain.Admin;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Menu
{
diff --git a/src/Web/Grand.Web.Common/Menu/SiteMapNode.cs b/src/Web/Grand.Web.Common/Menu/SiteMapNode.cs
index d9ae6f44e..92a744e5c 100644
--- a/src/Web/Grand.Web.Common/Menu/SiteMapNode.cs
+++ b/src/Web/Grand.Web.Common/Menu/SiteMapNode.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-//code from Telerik MVC Extensions
+//code from Telerik MVC Extensions
namespace Grand.Web.Common.Menu
{
public class SiteMapNode
diff --git a/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs
index ceb9cdc8e..5dd3fe7b6 100644
--- a/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/DbVersionCheckMiddleware.cs
@@ -4,8 +4,6 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
-using System.Linq;
namespace Grand.Web.Common.Middleware
{
diff --git a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
index 441c0cbe6..0c98fe82e 100644
--- a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Data;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Middleware
{
diff --git a/src/Web/Grand.Web.Common/Middleware/PoweredByMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/PoweredByMiddleware.cs
index 25842ac4a..8bee8b513 100644
--- a/src/Web/Grand.Web.Common/Middleware/PoweredByMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/PoweredByMiddleware.cs
@@ -1,6 +1,5 @@
//Contribution: Orchard project (https://github.com/OrchardCMS/OrchardCore)
using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Middleware
{
diff --git a/src/Web/Grand.Web.Common/Middleware/WorkContextMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/WorkContextMiddleware.cs
index eb3823a17..96f45e10a 100644
--- a/src/Web/Grand.Web.Common/Middleware/WorkContextMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/WorkContextMiddleware.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure;
using Microsoft.AspNetCore.Http;
-using System;
using System.Globalization;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Middleware
{
diff --git a/src/Web/Grand.Web.Common/Models/DatePickerDropDownsModel.cs b/src/Web/Grand.Web.Common/Models/DatePickerDropDownsModel.cs
index e966cd282..59bea7ef4 100644
--- a/src/Web/Grand.Web.Common/Models/DatePickerDropDownsModel.cs
+++ b/src/Web/Grand.Web.Common/Models/DatePickerDropDownsModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Common.Models
{
diff --git a/src/Web/Grand.Web.Common/Models/ILocalizedModel.cs b/src/Web/Grand.Web.Common/Models/ILocalizedModel.cs
index 9703bdb73..1614d86f0 100644
--- a/src/Web/Grand.Web.Common/Models/ILocalizedModel.cs
+++ b/src/Web/Grand.Web.Common/Models/ILocalizedModel.cs
@@ -1,7 +1,5 @@
//Contribution https://github.com/smartstore/SmartStoreNET/blob/2.0.x/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModel.cs
-using System.Collections.Generic;
-
namespace Grand.Web.Common.Models
{
public interface ILocalizedModel
diff --git a/src/Web/Grand.Web.Common/Page/PageHeadBuilder.cs b/src/Web/Grand.Web.Common/Page/PageHeadBuilder.cs
index c8e6d167e..4cd36771e 100644
--- a/src/Web/Grand.Web.Common/Page/PageHeadBuilder.cs
+++ b/src/Web/Grand.Web.Common/Page/PageHeadBuilder.cs
@@ -1,8 +1,4 @@
using Grand.Domain.Seo;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Grand.Web.Common.Page
{
diff --git a/src/Web/Grand.Web.Common/Page/Paging/BasePageableModel.cs b/src/Web/Grand.Web.Common/Page/Paging/BasePageableModel.cs
index 7a8601f4d..f17c81d4a 100644
--- a/src/Web/Grand.Web.Common/Page/Paging/BasePageableModel.cs
+++ b/src/Web/Grand.Web.Common/Page/Paging/BasePageableModel.cs
@@ -1,7 +1,6 @@
//Contributor : MVCContrib
using Grand.Domain;
-using System;
namespace Grand.Web.Common.Page.Paging
{
diff --git a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
index cbbd17ab2..4188084fb 100644
--- a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
+++ b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
@@ -4,9 +4,6 @@ using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Routing
{
diff --git a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
index 0472dea60..2283431da 100644
--- a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
+++ b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
@@ -5,9 +5,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Security.Authorization
{
diff --git a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
index 8ad9e096d..a4412eddf 100644
--- a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
+++ b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
@@ -4,8 +4,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Security.Authorization
{
diff --git a/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaResponse.cs b/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaResponse.cs
index 71e067ea9..394e1d999 100644
--- a/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaResponse.cs
+++ b/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaResponse.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Web.Common.Security.Captcha
+namespace Grand.Web.Common.Security.Captcha
{
public class GoogleReCaptchaResponse
{
diff --git a/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaValidator.cs b/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaValidator.cs
index 4de200958..1e25f9821 100644
--- a/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaValidator.cs
+++ b/src/Web/Grand.Web.Common/Security/Captcha/GoogleReCaptchaValidator.cs
@@ -1,9 +1,6 @@
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json.Linq;
-using System;
-using System.Linq;
using System.Net.Http;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Security.Captcha
{
diff --git a/src/Web/Grand.Web.Common/Security/Captcha/GoogleRecaptchaControl.cs b/src/Web/Grand.Web.Common/Security/Captcha/GoogleRecaptchaControl.cs
index 6817c80a0..a88735476 100644
--- a/src/Web/Grand.Web.Common/Security/Captcha/GoogleRecaptchaControl.cs
+++ b/src/Web/Grand.Web.Common/Security/Captcha/GoogleRecaptchaControl.cs
@@ -1,8 +1,5 @@
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Text;
namespace Grand.Web.Common.Security.Captcha
{
diff --git a/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs b/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs
index 3a404c904..fcc47bf63 100644
--- a/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
-using System.Collections.Generic;
using System.Globalization;
namespace Grand.Web.Common.Startup
diff --git a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
index 88cc5f008..5d52d2b9b 100644
--- a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.HostFiltering;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using System;
namespace Grand.Web.Common.Startup
{
diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
index dafb4ae8e..6383cea32 100644
--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
@@ -21,8 +21,6 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization;
using StackExchange.Redis;
-using System;
-using System.Linq;
using System.Reflection;
namespace Grand.Web.Common.Startup
diff --git a/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs b/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs
index 7eacf5f8a..b34cc870d 100644
--- a/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs
+++ b/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs
@@ -6,7 +6,6 @@ using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearchers;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using System.Linq;
namespace Grand.Web.Common.Startup
{
diff --git a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
index 069c3e8da..901449bc5 100644
--- a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Rewrite;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using System.IO;
namespace Grand.Web.Common.Startup
{
diff --git a/src/Web/Grand.Web.Common/StoreHelper.cs b/src/Web/Grand.Web.Common/StoreHelper.cs
index a64ef5985..7eb865ed2 100644
--- a/src/Web/Grand.Web.Common/StoreHelper.cs
+++ b/src/Web/Grand.Web.Common/StoreHelper.cs
@@ -4,9 +4,6 @@ using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
index 720440be6..e104be4a5 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
@@ -5,8 +5,6 @@ using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminInputTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminInputTagHelper.cs
index 35a727eea..117c313fc 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminInputTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminInputTagHelper.cs
@@ -4,11 +4,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
index ad5cff278..d08569ff4 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
index c6b8a4941..6e9918b8f 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabAppendTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabAppendTagHelper.cs
index 0a6b4c379..dccd56468 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabAppendTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabAppendTagHelper.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Text;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabContentTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabContentTagHelper.cs
index 8d7cc96ee..1ed2c438d 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabContentTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabContentTagHelper.cs
@@ -1,8 +1,6 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemTagHelper.cs
index 6e777756a..a04ff2eed 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemTagHelper.cs
@@ -1,7 +1,6 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemsTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemsTagHelper.cs
index 0adad0ee2..2f5933929 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemsTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripItemsTagHelper.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers.Admin
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
index 87dda22e7..4627a3d30 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs
@@ -3,10 +3,6 @@ using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
using Wangkanai.Detection.Models;
using Wangkanai.Detection.Services;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs
index bbf313a84..1856c5c67 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultDisplayTemplates.cs
@@ -1,12 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultEditorTemplates.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultEditorTemplates.cs
index 9fb73ef32..9e0a18623 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultEditorTemplates.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultEditorTemplates.cs
@@ -1,15 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
-using System.Text;
using System.Text.Encodings.Web;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs
index ffa214b54..7decec8e7 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/DefaultHtmlGenerator.cs
@@ -1,13 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
using System.Globalization;
-using System.Linq;
using System.Reflection;
using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Antiforgery;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ExpressionMetadataProvider.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ExpressionMetadataProvider.cs
index 5a26addf7..71a4153fa 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ExpressionMetadataProvider.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ExpressionMetadataProvider.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Diagnostics;
using System.Globalization;
using System.Linq.Expressions;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/NameAndIdProvider.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/NameAndIdProvider.cs
index 36e168041..5fffabd26 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/NameAndIdProvider.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/NameAndIdProvider.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Common.TagHelpers.Admin
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateBuilder.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateBuilder.cs
index 06dd2a668..3a410162a 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateBuilder.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateBuilder.cs
@@ -1,9 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Diagnostics;
using System.Globalization;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateRenderer.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateRenderer.cs
index 305de640b..f4649cf3f 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateRenderer.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/TemplateRenderer.cs
@@ -1,12 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ValidationHelpers.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ValidationHelpers.cs
index f8b18cbe2..a4632ff98 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ValidationHelpers.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ValidationHelpers.cs
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
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 b0d2162e2..bb43e1002 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBuffer.cs
@@ -1,12 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
-using System.Collections.Generic;
-using System.IO;
using System.Runtime.CompilerServices;
using System.Text.Encodings.Web;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBufferTextWriter.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBufferTextWriter.cs
index ca954259b..47df76274 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBufferTextWriter.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/Extend/ViewBufferTextWriter.cs
@@ -1,11 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
-using System.IO;
-using System.Text;
using System.Text.Encodings.Web;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
namespace Grand.Web.Common.TagHelpers.Admin
diff --git a/src/Web/Grand.Web.Common/TagHelpers/CanonicalUrlsTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/CanonicalUrlsTagHelper.cs
index f9d0c658b..2be6c8385 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/CanonicalUrlsTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/CanonicalUrlsTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
index 585e9453d..ad9f704b5 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
@@ -4,9 +4,7 @@ using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
using System.Globalization;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
index 83a9bd91d..461484a44 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
@@ -2,7 +2,6 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/HeadCustomTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/HeadCustomTagHelper.cs
index 87a5da8a6..2bdef5661 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/HeadCustomTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/HeadCustomTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/HtmlClassTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/HtmlClassTagHelper.cs
index 0fbd9b990..80e370c16 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/HtmlClassTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/HtmlClassTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/HtmlTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/HtmlTagHelper.cs
index d3ccaf3d1..982afe597 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/HtmlTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/HtmlTagHelper.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure;
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/IResourceManager.cs b/src/Web/Grand.Web.Common/TagHelpers/IResourceManager.cs
index 587536c60..0ff0c4418 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/IResourceManager.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/IResourceManager.cs
@@ -1,6 +1,5 @@
//Contribution: Orchard project (https://github.com/OrchardCMS/OrchardCore)
using Microsoft.AspNetCore.Html;
-using System.Collections.Generic;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/LinkTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/LinkTagHelper.cs
index 6e08b3a21..49a21c468 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/LinkTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/LinkTagHelper.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
index c1dc995fd..877cdb7eb 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
@@ -7,11 +7,7 @@ using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/MetaDescriptionTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/MetaDescriptionTagHelper.cs
index 4b1418af3..995dfb8b0 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/MetaDescriptionTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/MetaDescriptionTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/MetaKeywordsTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/MetaKeywordsTagHelper.cs
index 59d68a687..91a317622 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/MetaKeywordsTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/MetaKeywordsTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
index 25ca0f627..9288b615d 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
@@ -5,11 +5,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
index 9aa6680de..c60bd9a01 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Business.Storage.Interfaces;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/TagHelpers/ResourceManager.cs b/src/Web/Grand.Web.Common/TagHelpers/ResourceManager.cs
index 91798881c..a2e2f7ae0 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/ResourceManager.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/ResourceManager.cs
@@ -1,7 +1,4 @@
//Contribution: Orchard project (https://github.com/OrchardCMS/OrchardCore)
-using System;
-using System.Collections.Generic;
-using System.Linq;
using Microsoft.AspNetCore.Html;
namespace Grand.Web.Common.TagHelpers
diff --git a/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
index 08cc8743e..b392466d0 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/ScriptTagHelper.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
index 99d0d22d6..c6d87dc6a 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/TemplateTagHelper.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/TitleTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/TitleTagHelper.cs
index e8e15c758..3e6a528b4 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/TitleTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/TitleTagHelper.cs
@@ -1,6 +1,5 @@
using Grand.Web.Common.Page;
using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Threading.Tasks;
namespace Grand.Web.Common.TagHelpers
{
diff --git a/src/Web/Grand.Web.Common/Themes/IThemeContext.cs b/src/Web/Grand.Web.Common/Themes/IThemeContext.cs
index 17d298233..a1284ed0b 100644
--- a/src/Web/Grand.Web.Common/Themes/IThemeContext.cs
+++ b/src/Web/Grand.Web.Common/Themes/IThemeContext.cs
@@ -1,7 +1,5 @@
//Contribution https://github.com/smartstore/SmartStoreNET/blob/2.0.x/src/Presentation/SmartStore.Web.Framework/Themes/IThemeContext.cs
-using System.Threading.Tasks;
-
namespace Grand.Web.Common.Themes
{
/// <summary>
diff --git a/src/Web/Grand.Web.Common/Themes/IThemeList.cs b/src/Web/Grand.Web.Common/Themes/IThemeList.cs
index 059e62b36..fff642b3d 100644
--- a/src/Web/Grand.Web.Common/Themes/IThemeList.cs
+++ b/src/Web/Grand.Web.Common/Themes/IThemeList.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Grand.Web.Common.Themes
+namespace Grand.Web.Common.Themes
{
public interface IThemeList
{
diff --git a/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs b/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs
index 29cbe60d5..5bc1f622e 100644
--- a/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs
+++ b/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Plugins;
-using System.Collections.Generic;
namespace Grand.Web.Common.Themes
{
diff --git a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs b/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
index 09029831f..b8efe15af 100644
--- a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
+++ b/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Common.Themes
{
diff --git a/src/Web/Grand.Web.Common/Themes/ThemeList.cs b/src/Web/Grand.Web.Common/Themes/ThemeList.cs
index d67513c9b..25996b6d5 100644
--- a/src/Web/Grand.Web.Common/Themes/ThemeList.cs
+++ b/src/Web/Grand.Web.Common/Themes/ThemeList.cs
@@ -1,7 +1,5 @@
using Grand.SharedKernel.Extensions;
using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.IO;
namespace Grand.Web.Common.Themes
{
diff --git a/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs b/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs
index ae2edacf7..a9296f980 100644
--- a/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs
+++ b/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs
@@ -1,9 +1,6 @@
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Common.Themes
{
diff --git a/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs b/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs
index a29739850..f3ce61f99 100644
--- a/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs
+++ b/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor;
namespace Grand.Web.Common.Themes
{
diff --git a/src/Web/Grand.Web.Common/WorkContext.cs b/src/Web/Grand.Web.Common/WorkContext.cs
index 1c2164da2..ee57accad 100644
--- a/src/Web/Grand.Web.Common/WorkContext.cs
+++ b/src/Web/Grand.Web.Common/WorkContext.cs
@@ -16,10 +16,6 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Localization;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Wangkanai.Detection.Services;
namespace Grand.Web.Common
diff --git a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
index 08b40bded..292cd574c 100644
--- a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Blogs;
using Grand.Domain.Localization;
using Grand.Web.Commands.Models.Blogs;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Blogs
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
index f75dee7c7..a05e76ab5 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
@@ -4,11 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Commands.Models.Common;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Common
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
index 03c3585d2..c29365786 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
@@ -7,11 +7,6 @@ using Grand.Web.Common.Security.Captcha;
using Grand.Web.Commands.Models.Common;
using Grand.Web.Models.Common;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Common
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
index a0e4df816..02068ad17 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
@@ -13,12 +13,7 @@ using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Common;
using Grand.Web.Models.Common;
using MediatR;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Common
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
index c9874710d..75f41165d 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
@@ -8,12 +8,7 @@ using Grand.Domain.Messages;
using Grand.Web.Commands.Models.Common;
using Grand.Web.Events;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Common
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
index 10bb75e91..8131bb1aa 100644
--- a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.Business.Marketing.Interfaces.Courses;
using Grand.Web.Commands.Models.Courses;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Courses
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
index 9f76e6808..7db1566d4 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Marketing.Interfaces.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
index dfeb8d325..8e514a026 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
@@ -12,11 +12,6 @@ using Grand.Domain.Messages;
using Grand.Domain.Tax;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
index 7c541288f..24de29bdd 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
@@ -6,8 +6,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Localization;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
index 5f0f9b45a..88dbcf00f 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
index bdadeb6f1..153dfd0fb 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Customers.Utilities;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
index 147f940e3..c2fb5bd34 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Customers.Interfaces;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
index 1c5f9a72d..72c2eb152 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Customers.Utilities;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
index a1e1717c4..facd74cae 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
@@ -10,10 +10,6 @@ using Grand.Domain.Tax;
using Grand.Web.Commands.Models.Customers;
using Grand.Web.Events;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
index 7fcba110b..cabf38d54 100644
--- a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
@@ -6,9 +6,6 @@ using Grand.Domain.Localization;
using Grand.Domain.News;
using Grand.Web.Commands.Models.News;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.News
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
index d3a2f8003..daf674434 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
@@ -8,9 +8,6 @@ using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Models.Newsletter;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Newsletter
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
index c879cea7d..c4459ec48 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Marketing.Interfaces.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Models.Newsletter;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Newsletter
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
index 05048c43d..badf23c55 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
@@ -1,9 +1,6 @@
using Grand.Business.Marketing.Interfaces.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Newsletter
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
index dd8ba3fcc..1154b46b0 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Messages.Interfaces;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Orders
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
index db8f0e0aa..76f97329d 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
@@ -10,11 +10,6 @@ using Grand.Infrastructure;
using Grand.Web.Commands.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Orders
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
index 50ee0586e..7f7bb85af 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
@@ -8,10 +8,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Products
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
index 42183688a..f0ea7786c 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Products
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
index 166278dfa..30139436d 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
@@ -2,8 +2,6 @@
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Products
{
diff --git a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
index 9fdd8205f..fed02a631 100644
--- a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
@@ -7,11 +7,6 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.ShoppingCart;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
index 6ab4a4686..b1e85b1e2 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
@@ -6,8 +6,6 @@ using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Vendors;
using Grand.Web.Models.Common;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Vendors
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
index a168d2673..4cad615dc 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Vendors;
using Grand.Web.Commands.Models.Vendors;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Vendors
{
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
index 3b6af3166..7659245f7 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Vendors;
using Grand.Web.Commands.Models.Vendors;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Commands.Handler.Vendors
{
diff --git a/src/Web/Grand.Web/Commands/Models/Common/ContactAttributeChangeCommand.cs b/src/Web/Grand.Web/Commands/Models/Common/ContactAttributeChangeCommand.cs
index 20df621ee..c962ec9cf 100644
--- a/src/Web/Grand.Web/Commands/Models/Common/ContactAttributeChangeCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Common/ContactAttributeChangeCommand.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Stores;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Common
{
diff --git a/src/Web/Grand.Web/Commands/Models/Common/ContactUsSendCommand.cs b/src/Web/Grand.Web/Commands/Models/Common/ContactUsSendCommand.cs
index f675baa40..95bb90b4f 100644
--- a/src/Web/Grand.Web/Commands/Models/Common/ContactUsSendCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Common/ContactUsSendCommand.cs
@@ -2,7 +2,6 @@
using Grand.Web.Models.Common;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Common
{
diff --git a/src/Web/Grand.Web/Commands/Models/Common/PopupInteractiveCommand.cs b/src/Web/Grand.Web/Commands/Models/Common/PopupInteractiveCommand.cs
index fca8e4e51..dfc19af38 100644
--- a/src/Web/Grand.Web/Commands/Models/Common/PopupInteractiveCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Common/PopupInteractiveCommand.cs
@@ -1,6 +1,5 @@
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Common
{
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
index f13c58194..1a552ef03 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/CustomerRegisteredCommand.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
index 5a34b9d6f..996684d7e 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/UpdateCustomerInfoCommand.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Customers
{
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
index 11c9fd0f6..98255fb45 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionActivationCommand.cs
@@ -1,6 +1,5 @@
using Grand.Web.Models.Newsletter;
using MediatR;
-using System;
namespace Grand.Web.Commands.Models.Newsletter
{
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
index 41145f479..ad277a925 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
@@ -1,5 +1,4 @@
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.Newsletter
{
diff --git a/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs b/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
index 96509615d..cf976e334 100644
--- a/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Commands.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Components/BlogCategories.cs b/src/Web/Grand.Web/Components/BlogCategories.cs
index 18b6a4da8..0dd98c987 100644
--- a/src/Web/Grand.Web/Components/BlogCategories.cs
+++ b/src/Web/Grand.Web/Components/BlogCategories.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/BlogMonths.cs b/src/Web/Grand.Web/Components/BlogMonths.cs
index a0a31335a..e5a9dcc0f 100644
--- a/src/Web/Grand.Web/Components/BlogMonths.cs
+++ b/src/Web/Grand.Web/Components/BlogMonths.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/BlogPostProducts.cs b/src/Web/Grand.Web/Components/BlogPostProducts.cs
index beba68a4d..98cf8432a 100644
--- a/src/Web/Grand.Web/Components/BlogPostProducts.cs
+++ b/src/Web/Grand.Web/Components/BlogPostProducts.cs
@@ -5,8 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/BlogTags.cs b/src/Web/Grand.Web/Components/BlogTags.cs
index c6df408e3..183e42b1f 100644
--- a/src/Web/Grand.Web/Components/BlogTags.cs
+++ b/src/Web/Grand.Web/Components/BlogTags.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs b/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
index 543ed9151..8c7677788 100644
--- a/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Components/CategoryFeaturedProducts.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/CategoryNavigation.cs b/src/Web/Grand.Web/Components/CategoryNavigation.cs
index 4962183b1..523a06aa1 100644
--- a/src/Web/Grand.Web/Components/CategoryNavigation.cs
+++ b/src/Web/Grand.Web/Components/CategoryNavigation.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs b/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
index 898cca60c..77c48cb99 100644
--- a/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Components/CollectionFeaturedProducts.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/CollectionNavigation.cs b/src/Web/Grand.Web/Components/CollectionNavigation.cs
index 676228e06..f3d321b2e 100644
--- a/src/Web/Grand.Web/Components/CollectionNavigation.cs
+++ b/src/Web/Grand.Web/Components/CollectionNavigation.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/CrossSellProducts.cs b/src/Web/Grand.Web/Components/CrossSellProducts.cs
index 6510872b4..332dbab11 100644
--- a/src/Web/Grand.Web/Components/CrossSellProducts.cs
+++ b/src/Web/Grand.Web/Components/CrossSellProducts.cs
@@ -7,8 +7,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/CustomerNavigation.cs b/src/Web/Grand.Web/Components/CustomerNavigation.cs
index a56dba219..cf43d23f4 100644
--- a/src/Web/Grand.Web/Components/CustomerNavigation.cs
+++ b/src/Web/Grand.Web/Components/CustomerNavigation.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Customers;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
index a17b76e43..5a1060e82 100644
--- a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
@@ -6,8 +6,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/EmailWishlist.cs b/src/Web/Grand.Web/Components/EmailWishlist.cs
index 6d91431ca..8453bc53c 100644
--- a/src/Web/Grand.Web/Components/EmailWishlist.cs
+++ b/src/Web/Grand.Web/Components/EmailWishlist.cs
@@ -7,8 +7,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Models.ShoppingCart;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/EstimateShipping.cs b/src/Web/Grand.Web/Components/EstimateShipping.cs
index af5f6b0e1..c01633546 100644
--- a/src/Web/Grand.Web/Components/EstimateShipping.cs
+++ b/src/Web/Grand.Web/Components/EstimateShipping.cs
@@ -5,7 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/ExternalMethods.cs b/src/Web/Grand.Web/Components/ExternalMethods.cs
index c3b566885..cb059a8a4 100644
--- a/src/Web/Grand.Web/Components/ExternalMethods.cs
+++ b/src/Web/Grand.Web/Components/ExternalMethods.cs
@@ -3,8 +3,6 @@ using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Models.Customer;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/Footer.cs b/src/Web/Grand.Web/Components/Footer.cs
index 98b167e85..870e25ac3 100644
--- a/src/Web/Grand.Web/Components/Footer.cs
+++ b/src/Web/Grand.Web/Components/Footer.cs
@@ -14,9 +14,6 @@ using Grand.Domain.Vendors;
using Grand.Web.Common.Components;
using Grand.Web.Models.Common;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/HomePageBestSellers.cs b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
index 59589e37e..8805cfe2f 100644
--- a/src/Web/Grand.Web/Components/HomePageBestSellers.cs
+++ b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
@@ -8,10 +8,6 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Events.Cache;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Collections.Generic;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/HomePageBlog.cs b/src/Web/Grand.Web/Components/HomePageBlog.cs
index e9ea18703..3a4a6be28 100644
--- a/src/Web/Grand.Web/Components/HomePageBlog.cs
+++ b/src/Web/Grand.Web/Components/HomePageBlog.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Blogs;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/HomePageBrands.cs b/src/Web/Grand.Web/Components/HomePageBrands.cs
index b39fa4c5f..557c9da08 100644
--- a/src/Web/Grand.Web/Components/HomePageBrands.cs
+++ b/src/Web/Grand.Web/Components/HomePageBrands.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/HomePageCategories.cs b/src/Web/Grand.Web/Components/HomePageCategories.cs
index 55e4e614b..44c68ae98 100644
--- a/src/Web/Grand.Web/Components/HomePageCategories.cs
+++ b/src/Web/Grand.Web/Components/HomePageCategories.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/HomePageCollections.cs b/src/Web/Grand.Web/Components/HomePageCollections.cs
index 5c3e31f2f..90e82683d 100644
--- a/src/Web/Grand.Web/Components/HomePageCollections.cs
+++ b/src/Web/Grand.Web/Components/HomePageCollections.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/HomePageNewProducts.cs b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
index 6c63a0a2e..657b2bbd8 100644
--- a/src/Web/Grand.Web/Components/HomePageNewProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
@@ -5,8 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/HomePageNews.cs b/src/Web/Grand.Web/Components/HomePageNews.cs
index 5e9bef344..f7d7d7432 100644
--- a/src/Web/Grand.Web/Components/HomePageNews.cs
+++ b/src/Web/Grand.Web/Components/HomePageNews.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.News;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/HomePageProducts.cs b/src/Web/Grand.Web/Components/HomePageProducts.cs
index 2a7a1d10d..ac4a933e5 100644
--- a/src/Web/Grand.Web/Components/HomePageProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageProducts.cs
@@ -7,8 +7,6 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Events.Cache;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/InteractiveForm.cs b/src/Web/Grand.Web/Components/InteractiveForm.cs
index 00980d794..5df6345e6 100644
--- a/src/Web/Grand.Web/Components/InteractiveForm.cs
+++ b/src/Web/Grand.Web/Components/InteractiveForm.cs
@@ -2,7 +2,6 @@
using Grand.Web.Features.Models.Messages;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
index 0140c95b3..625594d2a 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
@@ -4,9 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.ViewComponents
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
index c9859fc49..7f52d06fc 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
@@ -4,7 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Business.Marketing.Interfaces.Knowledgebase;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Components
diff --git a/src/Web/Grand.Web/Components/Menu.cs b/src/Web/Grand.Web/Components/Menu.cs
index 870575b1e..bffd49d90 100644
--- a/src/Web/Grand.Web/Components/Menu.cs
+++ b/src/Web/Grand.Web/Components/Menu.cs
@@ -5,7 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/OrderSummary.cs b/src/Web/Grand.Web/Components/OrderSummary.cs
index 8edf17bcb..9810bdae9 100644
--- a/src/Web/Grand.Web/Components/OrderSummary.cs
+++ b/src/Web/Grand.Web/Components/OrderSummary.cs
@@ -6,7 +6,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/OrderTotals.cs b/src/Web/Grand.Web/Components/OrderTotals.cs
index 7b3e8d827..e300abbd5 100644
--- a/src/Web/Grand.Web/Components/OrderTotals.cs
+++ b/src/Web/Grand.Web/Components/OrderTotals.cs
@@ -5,7 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/PageBlock.cs b/src/Web/Grand.Web/Components/PageBlock.cs
index a5be39c16..641f3a83c 100644
--- a/src/Web/Grand.Web/Components/PageBlock.cs
+++ b/src/Web/Grand.Web/Components/PageBlock.cs
@@ -2,7 +2,6 @@
using Grand.Web.Features.Models.Pages;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/PersonalizedProducts.cs b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
index 4c1da6892..64d7584ad 100644
--- a/src/Web/Grand.Web/Components/PersonalizedProducts.cs
+++ b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
@@ -5,8 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/PopularProductTags.cs b/src/Web/Grand.Web/Components/PopularProductTags.cs
index f9a338611..2e19df2c8 100644
--- a/src/Web/Grand.Web/Components/PopularProductTags.cs
+++ b/src/Web/Grand.Web/Components/PopularProductTags.cs
@@ -3,8 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/PopupAction.cs b/src/Web/Grand.Web/Components/PopupAction.cs
index f927c6afc..b770f1737 100644
--- a/src/Web/Grand.Web/Components/PopupAction.cs
+++ b/src/Web/Grand.Web/Components/PopupAction.cs
@@ -5,7 +5,6 @@ using Grand.Web.Events;
using Grand.Web.Models.Common;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/ProductEmailAFriend.cs b/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
index 2f5f98cf5..8c8e798e7 100644
--- a/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
+++ b/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
@@ -6,7 +6,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Models.Catalog;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/ProductReviews.cs b/src/Web/Grand.Web/Components/ProductReviews.cs
index 9cab730ee..4f5fda0ed 100644
--- a/src/Web/Grand.Web/Components/ProductReviews.cs
+++ b/src/Web/Grand.Web/Components/ProductReviews.cs
@@ -5,7 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
index 82d11705b..dd8f21bf9 100644
--- a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
+++ b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
@@ -8,8 +8,6 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Events.Cache;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
index 83555893e..6c1b123b0 100644
--- a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
+++ b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
@@ -5,8 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/RecommendedProducts.cs b/src/Web/Grand.Web/Components/RecommendedProducts.cs
index 183e2f81f..65f769f22 100644
--- a/src/Web/Grand.Web/Components/RecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/RecommendedProducts.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/RelatedProducts.cs b/src/Web/Grand.Web/Components/RelatedProducts.cs
index bd8c4f582..215d2119f 100644
--- a/src/Web/Grand.Web/Components/RelatedProducts.cs
+++ b/src/Web/Grand.Web/Components/RelatedProducts.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/SearchBox.cs b/src/Web/Grand.Web/Components/SearchBox.cs
index 363c6273b..09dab97a7 100644
--- a/src/Web/Grand.Web/Components/SearchBox.cs
+++ b/src/Web/Grand.Web/Components/SearchBox.cs
@@ -3,7 +3,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/SimilarProducts.cs b/src/Web/Grand.Web/Components/SimilarProducts.cs
index 65dabe90b..4e8674d1c 100644
--- a/src/Web/Grand.Web/Components/SimilarProducts.cs
+++ b/src/Web/Grand.Web/Components/SimilarProducts.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/SuggestedProducts.cs b/src/Web/Grand.Web/Components/SuggestedProducts.cs
index bedb6958b..1e4c72956 100644
--- a/src/Web/Grand.Web/Components/SuggestedProducts.cs
+++ b/src/Web/Grand.Web/Components/SuggestedProducts.cs
@@ -5,8 +5,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/VendorContact.cs b/src/Web/Grand.Web/Components/VendorContact.cs
index 3957ab072..3d2d07aa7 100644
--- a/src/Web/Grand.Web/Components/VendorContact.cs
+++ b/src/Web/Grand.Web/Components/VendorContact.cs
@@ -8,7 +8,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Models.Common;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/VendorNavigation.cs b/src/Web/Grand.Web/Components/VendorNavigation.cs
index 4ebc3716b..33f8dd35b 100644
--- a/src/Web/Grand.Web/Components/VendorNavigation.cs
+++ b/src/Web/Grand.Web/Components/VendorNavigation.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/VendorReviews.cs b/src/Web/Grand.Web/Components/VendorReviews.cs
index 50a8baa03..50a449eae 100644
--- a/src/Web/Grand.Web/Components/VendorReviews.cs
+++ b/src/Web/Grand.Web/Components/VendorReviews.cs
@@ -7,7 +7,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Vendors;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/Widget.cs b/src/Web/Grand.Web/Components/Widget.cs
index 3f9f7ff8c..74ec3b11f 100644
--- a/src/Web/Grand.Web/Components/Widget.cs
+++ b/src/Web/Grand.Web/Components/Widget.cs
@@ -6,9 +6,6 @@ using Grand.Web.Common.Components;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Cms;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.cs
index 0617a3c08..d09e62fc5 100644
--- a/src/Web/Grand.Web/Controllers/AccountController.cs
+++ b/src/Web/Grand.Web/Controllers/AccountController.cs
@@ -24,9 +24,6 @@ using Grand.Web.Models.Customer;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/ActionCartController.cs b/src/Web/Grand.Web/Controllers/ActionCartController.cs
index 84e07ddf4..bcb72a4fe 100644
--- a/src/Web/Grand.Web/Controllers/ActionCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ActionCartController.cs
@@ -17,11 +17,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/BlogController.cs b/src/Web/Grand.Web/Controllers/BlogController.cs
index 08bc8f0eb..13a867e4b 100644
--- a/src/Web/Grand.Web/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web/Controllers/BlogController.cs
@@ -14,8 +14,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.cs
index dba415fd0..18be60ec1 100644
--- a/src/Web/Grand.Web/Controllers/CatalogController.cs
+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs
@@ -27,9 +27,6 @@ using MediatR;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index 894c13d8f..3a5395261 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -27,10 +27,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.cs
index d2cc27b8d..5ee99b288 100644
--- a/src/Web/Grand.Web/Controllers/CommonController.cs
+++ b/src/Web/Grand.Web/Controllers/CommonController.cs
@@ -25,12 +25,7 @@ using Grand.Web.Models.Common;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Net;
-using System.Threading.Tasks;
using Grand.Web.Common.Controllers;
namespace Grand.Web.Controllers
diff --git a/src/Web/Grand.Web/Controllers/ComponentController.cs b/src/Web/Grand.Web/Controllers/ComponentController.cs
index a7c6d1976..c6c3b4326 100644
--- a/src/Web/Grand.Web/Controllers/ComponentController.cs
+++ b/src/Web/Grand.Web/Controllers/ComponentController.cs
@@ -1,7 +1,6 @@
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewComponents;
-using System.Collections.Generic;
using System.Reflection;
namespace Grand.Web.Controllers
diff --git a/src/Web/Grand.Web/Controllers/CountryController.cs b/src/Web/Grand.Web/Controllers/CountryController.cs
index bd111a2b1..e8cf19625 100644
--- a/src/Web/Grand.Web/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web/Controllers/CountryController.cs
@@ -4,8 +4,6 @@ using Grand.Web.Models.Common;
using Grand.Web.Features.Models.Common;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/CourseController.cs b/src/Web/Grand.Web/Controllers/CourseController.cs
index 494fec033..3a1304325 100644
--- a/src/Web/Grand.Web/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web/Controllers/CourseController.cs
@@ -15,7 +15,6 @@ using MediatR;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Net.Http.Headers;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/DownloadController.cs b/src/Web/Grand.Web/Controllers/DownloadController.cs
index 35bf00fda..ae5cc65e5 100644
--- a/src/Web/Grand.Web/Controllers/DownloadController.cs
+++ b/src/Web/Grand.Web/Controllers/DownloadController.cs
@@ -10,12 +10,8 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.IO;
using System.IO.Compression;
-using System.Linq;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index 6bc3a0d59..98adaa062 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -16,10 +16,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
index 8cd928413..5985af583 100644
--- a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
+++ b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
@@ -18,9 +18,6 @@ using Grand.Web.Common.Security.Captcha;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/LetsEncryptController.cs b/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
index 82bb6e6f1..3e47e8cf8 100644
--- a/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
+++ b/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Common;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.IO;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
index 303bb1b8d..13d3c9f5a 100644
--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
@@ -16,9 +16,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/NewsController.cs b/src/Web/Grand.Web/Controllers/NewsController.cs
index 3feb1817c..be810ee37 100644
--- a/src/Web/Grand.Web/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsController.cs
@@ -15,8 +15,6 @@ using Grand.Web.Features.Models.News;
using Grand.Web.Models.News;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/NewsletterController.cs b/src/Web/Grand.Web/Controllers/NewsletterController.cs
index 1f83a225a..5dea60f16 100644
--- a/src/Web/Grand.Web/Controllers/NewsletterController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsletterController.cs
@@ -3,9 +3,6 @@ using Grand.Web.Common.Controllers;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.cs
index 65c331e7d..45257b813 100644
--- a/src/Web/Grand.Web/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web/Controllers/OrderController.cs
@@ -15,11 +15,6 @@ using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
index 800ef2a13..003e9e702 100644
--- a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
+++ b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
@@ -11,9 +11,6 @@ using Grand.Web.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/PageController.cs b/src/Web/Grand.Web/Controllers/PageController.cs
index 044d7b4fd..02be39708 100644
--- a/src/Web/Grand.Web/Controllers/PageController.cs
+++ b/src/Web/Grand.Web/Controllers/PageController.cs
@@ -5,7 +5,6 @@ using Grand.Infrastructure;
using Grand.Web.Features.Models.Pages;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/PixelController.cs b/src/Web/Grand.Web/Controllers/PixelController.cs
index 9b88fa65f..6439a0687 100644
--- a/src/Web/Grand.Web/Controllers/PixelController.cs
+++ b/src/Web/Grand.Web/Controllers/PixelController.cs
@@ -4,8 +4,6 @@ using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.cs
index 15b3349e8..68e6188c5 100644
--- a/src/Web/Grand.Web/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web/Controllers/ProductController.cs
@@ -26,11 +26,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs b/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
index 0aa98d497..99a935242 100644
--- a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
+++ b/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
@@ -2,8 +2,6 @@
using Grand.Domain.PushNotifications;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
index 0b1509440..1ffb09e2d 100644
--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
@@ -22,11 +22,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
index d4e19ff50..ae3e7c8b2 100644
--- a/src/Web/Grand.Web/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -23,9 +23,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.cs
index 600ca8f8d..c9f841cb4 100644
--- a/src/Web/Grand.Web/Controllers/WishlistController.cs
+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs
@@ -17,10 +17,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Controllers
{
diff --git a/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
index 97b0cc94d..559633fc3 100644
--- a/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/BlogCategoryNotificatioHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Blogs;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events.Cache
{
diff --git a/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
index 4a9ceb89d..753a3e018 100644
--- a/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/BlogPostNotificatioHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Blogs;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events.Cache
{
diff --git a/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
index 63b04a7a8..73539a49d 100644
--- a/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/NewsItemNotificatioHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.News;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events.Cache
{
diff --git a/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs b/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
index 4d01fb318..88194c23e 100644
--- a/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
+++ b/src/Web/Grand.Web/Events/Cache/VendorNotificatioHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Vendors;
using Grand.Infrastructure.Events;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events.Cache
{
diff --git a/src/Web/Grand.Web/Events/CustomerInfoEvent.cs b/src/Web/Grand.Web/Events/CustomerInfoEvent.cs
index 7fa3ad1ad..e0c0a19bd 100644
--- a/src/Web/Grand.Web/Events/CustomerInfoEvent.cs
+++ b/src/Web/Grand.Web/Events/CustomerInfoEvent.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Events
{
diff --git a/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs b/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
index 43eba5f5a..52f1a78f2 100644
--- a/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
+++ b/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Customers.Events;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events
{
diff --git a/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs b/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
index 47f6dd20c..efce55203 100644
--- a/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
+++ b/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Common.Interfaces.Logging;
using Grand.Business.Customers.Events;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Events
{
diff --git a/src/Web/Grand.Web/Events/PopupInteractiveEvent.cs b/src/Web/Grand.Web/Events/PopupInteractiveEvent.cs
index 15fa7383c..37b658f47 100644
--- a/src/Web/Grand.Web/Events/PopupInteractiveEvent.cs
+++ b/src/Web/Grand.Web/Events/PopupInteractiveEvent.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Events
{
diff --git a/src/Web/Grand.Web/Extensions/MappingExtensions.cs b/src/Web/Grand.Web/Extensions/MappingExtensions.cs
index 548109ccf..8083da726 100644
--- a/src/Web/Grand.Web/Extensions/MappingExtensions.cs
+++ b/src/Web/Grand.Web/Extensions/MappingExtensions.cs
@@ -12,7 +12,6 @@ using Grand.Web.Models.Course;
using Grand.Web.Models.Pages;
using Grand.Web.Models.Vendors;
using Microsoft.AspNetCore.Http;
-using System;
using System.Globalization;
namespace Grand.Web.Extensions
diff --git a/src/Web/Grand.Web/Extensions/OrderExtensions.cs b/src/Web/Grand.Web/Extensions/OrderExtensions.cs
index b6db7dc18..cc077250f 100644
--- a/src/Web/Grand.Web/Extensions/OrderExtensions.cs
+++ b/src/Web/Grand.Web/Extensions/OrderExtensions.cs
@@ -1,7 +1,6 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-using System.Threading.Tasks;
namespace Grand.Web.Extensions
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
index 6fce1084b..307178814 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
@@ -6,9 +6,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
index f5aca6a75..b49c9f1be 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
@@ -13,10 +13,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
index 2da768bca..6491558a9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
@@ -10,10 +10,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Blogs
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
index 406c82ddb..ed0a8684f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
@@ -6,9 +6,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
index 1fd864d52..19df56aef 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
@@ -5,11 +5,6 @@ using Grand.Web.Features.Models.Blogs;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Cms.Extensions;
namespace Grand.Web.Features.Handlers.Blogs
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
index d9f328a16..256589e67 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
@@ -12,10 +12,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
index 3b35f18f4..b76a11383 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
@@ -10,9 +10,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
index 813a1ad8e..356ad87b4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
@@ -9,10 +9,6 @@ using Grand.Web.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
index 1c9f13e32..d76903f2f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Brands;
using Grand.Web.Features.Models.Catalog;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
index ae5ef0831..0b64f8dae 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
@@ -14,10 +14,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
index 559ee2bf6..f1d1db785 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
@@ -18,10 +18,6 @@ using Grand.Web.Models.Media;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
index 3f96d70c4..f28c55059 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Categories;
using Grand.Web.Features.Models.Catalog;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
index ef32a1d9c..0210958a5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
@@ -2,9 +2,6 @@
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
index e08b0b9e9..110646c3e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
@@ -10,10 +10,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.SharedKernel.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
index 69a11177d..6a4bfd986 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
@@ -4,9 +4,6 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
index 1413d9254..65a7f7b7f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
@@ -10,9 +10,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
index da7a718f1..4c9f892c8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
@@ -14,10 +14,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
index 51fe1335a..dce84b3ae 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
@@ -12,10 +12,6 @@ using Grand.Web.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
index 6ee5f5422..9bfc0704a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Collections;
using Grand.Web.Features.Models.Catalog;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
index adbdbe290..21ad1f0a1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
@@ -7,8 +7,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
index e3ebedbe5..cdc2b5a67 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Features.Models.Catalog;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
index d0d8d1999..5e3cec501 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
@@ -9,10 +9,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
index 69e751c52..9201c1142 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
@@ -10,9 +10,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
index 74b02546c..b071fe0c0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
@@ -9,10 +9,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
index b1734fb81..010876c08 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
@@ -16,11 +16,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
index 1eae77916..8281338a0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
@@ -6,9 +6,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
index 105a71e4f..7c005f454 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
@@ -2,9 +2,6 @@
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
index 2ebe17e21..f60002684 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
index b96004f14..1b9c37012 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
@@ -5,9 +5,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
index fc43d3caf..ab295e825 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
@@ -19,11 +19,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
index 1441c130f..7e63550c5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
@@ -8,10 +8,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
index 42f6215ad..26f232e1f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
@@ -20,11 +20,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
index e40980e5d..5bc9f562e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
@@ -11,9 +11,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
index 67da409df..9f80003e7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
@@ -16,10 +16,6 @@ using Grand.Web.Models.Media;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
index c953f94b0..83dfd6a4a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
@@ -6,8 +6,6 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
index 5abc2a90b..5b6421fec 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Grand.Domain.Catalog;
+using Grand.Domain.Catalog;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
index 1d3afe1ea..4ab595b35 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
@@ -5,10 +5,6 @@ using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
index 9b633eab1..ddf143717 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Orders;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
index 7cdf35c6b..eb63b932c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
@@ -2,8 +2,6 @@
using Grand.Domain.Payments;
using Grand.Web.Features.Models.Checkout;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
index 7e1aed81b..c2d7bf71f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
@@ -2,10 +2,6 @@
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Checkout;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
index b5e169e97..c7d6686ae 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentInfoHandler.cs
@@ -1,8 +1,6 @@
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
index 028c4f0e5..369ebb2c6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
@@ -11,11 +11,6 @@ using Grand.Domain.Payments;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
index f569dff39..9ba229e04 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
@@ -10,10 +10,6 @@ using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
index 893c1f1cc..9c89cc0ba 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
@@ -9,10 +9,6 @@ using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
index c9260b5fc..e46b5a3b6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
@@ -12,11 +12,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
index 5a30a4112..5ad6defba 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
@@ -3,11 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Features.Models.Common;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
index 274ed7eb3..5a30edaca 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Customers;
using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Common;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
index 63028a5bf..50787c5b2 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Features.Models.Common;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
index 004b99c17..02155c5e2 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
@@ -18,10 +18,6 @@ using Grand.Web.Models.Common;
using Grand.Web.Models.Knowledgebase;
using Grand.Web.Models.Pages;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Brands;
namespace Grand.Web.Features.Handlers.Common
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
index efd56d236..f98965ce6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
@@ -4,10 +4,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Common;
using Grand.Web.Features.Models.Common;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Extensions;
namespace Grand.Web.Features.Handlers.Common
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
index 90fcbbfd3..5b2e4422c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
@@ -9,10 +9,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Models.Vendors;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
index a835f099e..ff2303829 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Web.Features.Models.Courses;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Courses
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
index f2d47c0c0..439c2cc09 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
@@ -5,9 +5,6 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Courses
{
public class GetCourseHandler : IRequestHandler<GetCourse, CourseModel>
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
index 9f0206ed6..13098b766 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
@@ -4,8 +4,6 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Courses
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
index 8984e1e4e..94c050e3a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
@@ -4,9 +4,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Common.Interfaces.Security;
namespace Grand.Web.Features.Handlers.Customers
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
index c5b378fb0..fd576f776 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
@@ -5,10 +5,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
index 81c46d902..c36407a91 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
@@ -4,9 +4,6 @@ using Grand.Business.Marketing.Interfaces.Courses;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
index 84c790732..93e808eb8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
@@ -5,10 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
index 89ba02156..1d47f93c7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Documents;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
index 6f946bf67..1e13a4021 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
@@ -6,9 +6,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
index 44591c121..91f7e0fd6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
@@ -11,10 +11,6 @@ using Grand.Web.Models.Customer;
using Grand.Web.Models.Newsletter;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
index 93e863b55..5ac029cdd 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetNavigationHandler.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Vendors;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
index ae56dcd71..9b926d1f6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
@@ -3,9 +3,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
index 5280dbd68..8f2b0e66e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
@@ -3,11 +3,6 @@ using Grand.Domain.Common;
using Grand.Business.Customers.Interfaces;
using Grand.Web.Features.Models.Customers;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
index 1fa2a749c..2a706f988 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
index 6f31b526d..b911ca438 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
@@ -10,9 +10,6 @@ using Grand.Web.Models.Customer;
using Grand.Web.Models.Newsletter;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
index 494663dbe..101607a31 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
@@ -5,9 +5,6 @@ using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
index c6db25cff..1e612aeb4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
index ccaf86fee..443dae63c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
index 516784b4b..1fdfd9b45 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
@@ -4,9 +4,6 @@ using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
index 9197c88cd..372b42b70 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
@@ -3,8 +3,6 @@ using Grand.Business.Checkout.Interfaces.Orders;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs b/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
index 8c80e3521..447a07616 100644
--- a/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Messages;
using Grand.Web.Features.Models.Messages;
using Grand.Web.Models.Messages;
using MediatR;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Messages
{
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
index ce5002873..4160a25fe 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
@@ -12,9 +12,6 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.News
{
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
index 05b90fd0c..72664e475 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
@@ -12,10 +12,6 @@ using Grand.Web.Features.Models.News;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.News
{
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
index 007213991..0b6026ae7 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
@@ -10,9 +10,6 @@ using Grand.Web.Features.Models.News;
using Grand.Web.Models.Media;
using Grand.Web.Models.News;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.News
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
index ea9eb01ee..24637c05d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
@@ -5,9 +5,6 @@ using Grand.Domain.Orders;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Newsletter
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
index bfc9489c6..c02d64f20 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
@@ -8,9 +8,6 @@ using Grand.Domain.Orders;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
index 4c77b9734..499fa722f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
@@ -10,10 +10,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
index 6f42e46fd..06a1a517f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
@@ -15,10 +15,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
index 293ff740c..666045157 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
@@ -8,10 +8,6 @@ using Grand.Domain.Tax;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
index d463fa864..66eb453ae 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
@@ -21,11 +21,6 @@ using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Media;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
index f7f9a5de0..1825d2be1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
@@ -10,11 +10,6 @@ using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Orders
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
index 3c9f7c495..ce77200e8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
@@ -6,9 +6,6 @@ using Grand.Web.Extensions;
using Grand.Web.Features.Models.Pages;
using Grand.Web.Models.Pages;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Pages
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
index 618abce64..08e62baf9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Cms.Interfaces;
using Grand.Web.Features.Models.Pages;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Pages
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
index b888e517c..2eefd9e46 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
@@ -17,11 +17,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index 8a1a0418d..7def10da4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -32,12 +32,7 @@ using Grand.Web.Models.Media;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Brands;
namespace Grand.Web.Features.Handlers.Products
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
index fa9ce9390..2e2801fa3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
@@ -1,10 +1,6 @@
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Web.Features.Models.Products;
using MediatR;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
index 86445faae..c65882e5b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
@@ -17,12 +17,7 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
index 10bde6b53..7c577c3f7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewOverviewHandler.cs
@@ -1,8 +1,6 @@
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
index 3f7c4bdfc..754081254 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
@@ -8,9 +8,6 @@ using Grand.Web.Common.Security.Captcha;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
index db9c03db1..d20a66d15 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
@@ -2,12 +2,7 @@
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Extensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
index 7f6b1d1ff..ba64ebfcd 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
@@ -15,11 +15,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.Media;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
index 2215f34cf..9f5615363 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
@@ -8,11 +8,6 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
index f8edc5a6b..99de366e5 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
@@ -12,10 +12,6 @@ using Grand.Domain.Shipping;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
index 93c59d42d..f5b7c3d62 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
@@ -22,11 +22,6 @@ using Grand.Web.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
index 6d867fd17..c5572516e 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
@@ -14,10 +14,6 @@ using Grand.Domain.Tax;
using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
index b02acc264..953f10cdb 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
@@ -4,11 +4,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Features.Models.ShoppingCart;
using MediatR;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index e3b75bdad..82385517e 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -34,11 +34,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;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index 63d1d5d66..fdf6b50ab 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -22,10 +22,6 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Routing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
index 51df047f7..616fe6170 100644
--- a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
@@ -8,9 +8,6 @@ using Grand.Web.Common.Security.Captcha;
using Grand.Web.Features.Models.Vendors;
using Grand.Web.Models.Vendors;
using MediatR;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
namespace Grand.Web.Features.Handlers.Vendors
{
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
index ecdecc6f9..f0b3d8823 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostCategory.cs
@@ -1,6 +1,5 @@
using Grand.Web.Models.Blogs;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
index c289cf74f..63eab0936 100644
--- a/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
+++ b/src/Web/Grand.Web/Features/Models/Blogs/GetBlogPostYear.cs
@@ -1,6 +1,5 @@
using Grand.Web.Models.Blogs;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
index ded52f8ca..79f553745 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetBrandAll.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
index 0a6f915f6..1d9fd3a00 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategoryFeaturedProducts.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
index 05ff5822c..8c2a45432 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCategorySimple.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
index c109a74ad..dcdbcef63 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetChildCategoryIds.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
index 67f90a6c9..3fd10babd 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionAll.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
index 552544a16..4a881c554 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetCollectionFeaturedProducts.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
index 71c5d4c21..f63a51d6b 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetComparedProducts.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
index c7e8bfe24..ab7846558 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageBrands.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
index 2e3d7331e..59bbf02f5 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCategory.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
index 7bcff895c..c60820d79 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetHomepageCollections.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
index 2ccd48f8b..6f002b995 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetSearchAutoComplete.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
index 8ea508211..b48ccd7a7 100644
--- a/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
+++ b/src/Web/Grand.Web/Features/Models/Catalog/GetVendorAll.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
index d6b561c35..7ee6e01c1 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetBillingAddress.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
index 4fe892383..77f1fd707 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetConfirmOrder.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Orders;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
index 732a5fee5..fc57f16db 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetIsPaymentWorkflowRequired.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Orders;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
index 0bf8a29dc..cf4a183b8 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentMethod.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Grand.Domain.Customers;
+using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
index a1d215d16..35a71b570 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingAddress.cs
@@ -5,7 +5,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
index 87ffb632d..2c0440f50 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetShippingMethod.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.Checkout;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs b/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
index 34ee54790..ec54d5e82 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetAddressModel.cs
@@ -5,8 +5,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Common;
using MediatR;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Common
{
public class GetAddressModel : IRequest<AddressModel>
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs b/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
index 182b752d0..b8690dfce 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Common;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Common
{
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs b/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
index 7be4fca5d..23771767c 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetPrivacyPreference.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Stores;
using Grand.Web.Models.Common;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Common
{
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs b/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
index 98282bf2d..5cd395ea1 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetStatesProvince.cs
@@ -1,6 +1,5 @@
using Grand.Web.Models.Common;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Common
{
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs b/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
index a5c18158f..967916d27 100644
--- a/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
+++ b/src/Web/Grand.Web/Features/Models/Common/GetVendorAddress.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Directory;
using Grand.Domain.Localization;
using Grand.Web.Models.Vendors;
using MediatR;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Common
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
index 2750a03b4..2c2cfc390 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetCustomAttributes.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs b/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
index 3227c91a3..e595a015f 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetInfo.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
index 09b7f7996..e747f7b74 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Common;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs b/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
index 925233081..2f53e89ca 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetRegister.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
index ec686bd13..3fb93f323 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetSubAccounts.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs b/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
index 73723144d..996752b38 100644
--- a/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
+++ b/src/Web/Grand.Web/Features/Models/Customers/GetUserAgreement.cs
@@ -1,6 +1,5 @@
using Grand.Web.Models.Customer;
using MediatR;
-using System;
namespace Grand.Web.Features.Models.Customers
{
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
index bb09d8d66..0b2eba625 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductOverview.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Products
{
diff --git a/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs b/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
index 0361c0302..961830fdd 100644
--- a/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
+++ b/src/Web/Grand.Web/Features/Models/Products/GetProductSpecification.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Localization;
using Grand.Web.Models.Catalog;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.Products
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
index 1837b0b45..2284f02ab 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetAddToCart.cs
@@ -8,8 +8,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
index fde6ca645..31edbb39c 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShipping.cs
@@ -5,7 +5,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
index b1b3e5a4c..3226f37e5 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetEstimateShippingResult.cs
@@ -4,7 +4,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
index 76f461735..b2baf1dbe 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetOrderTotals.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
index eac2e2153..fd02411ad 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
@@ -2,7 +2,6 @@
using Grand.Domain.Common;
using MediatR;
using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
index 9ec4692b4..522214c65 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetShoppingCart.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
index 2daf59d07..e9f43d87c 100644
--- a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
+++ b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetWishlist.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Web.Models.ShoppingCart;
using MediatR;
-using System.Collections.Generic;
namespace Grand.Web.Features.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogCommentModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogCommentModel.cs
index 79c6bb165..f6830cd2d 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogCommentModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogCommentModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogPagingFilteringModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogPagingFilteringModel.cs
index 3db0ec59b..44fe8ed30 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogPagingFilteringModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogPagingFilteringModel.cs
@@ -1,5 +1,4 @@
using Grand.Web.Common.Page.Paging;
-using System;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogPostListModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogPostListModel.cs
index d7665574c..01e0b520b 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogPostListModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogPostListModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System.Collections.Generic;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogPostModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogPostModel.cs
index e31fb6d7f..0f7975273 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogPostModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogPostModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogPostTagListModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogPostTagListModel.cs
index 59d9f199f..4a9bfaf37 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogPostTagListModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogPostTagListModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/BlogPostYearMonthModel.cs b/src/Web/Grand.Web/Models/Blogs/BlogPostYearMonthModel.cs
index b58683607..32f4d9bac 100644
--- a/src/Web/Grand.Web/Models/Blogs/BlogPostYearMonthModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/BlogPostYearMonthModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Blogs/HomePageBlogItemsModel.cs b/src/Web/Grand.Web/Models/Blogs/HomePageBlogItemsModel.cs
index f4361301b..c1ce804b0 100644
--- a/src/Web/Grand.Web/Models/Blogs/HomePageBlogItemsModel.cs
+++ b/src/Web/Grand.Web/Models/Blogs/HomePageBlogItemsModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Blogs
{
diff --git a/src/Web/Grand.Web/Models/Catalog/BrandModel.cs b/src/Web/Grand.Web/Models/Catalog/BrandModel.cs
index 732cdc797..996b767b0 100644
--- a/src/Web/Grand.Web/Models/Catalog/BrandModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/BrandModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs b/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
index 1dd5d483c..b793125ed 100644
--- a/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
@@ -6,10 +6,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Common.Page.Paging;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CategoryModel.cs b/src/Web/Grand.Web/Models/Catalog/CategoryModel.cs
index b8b4f59e8..e464af7ee 100644
--- a/src/Web/Grand.Web/Models/Catalog/CategoryModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CategoryModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CategoryNavigationModel.cs b/src/Web/Grand.Web/Models/Catalog/CategoryNavigationModel.cs
index b63e95261..a957dda42 100644
--- a/src/Web/Grand.Web/Models/Catalog/CategoryNavigationModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CategoryNavigationModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CategorySimpleModel.cs b/src/Web/Grand.Web/Models/Catalog/CategorySimpleModel.cs
index 8421bff27..f47b678ce 100644
--- a/src/Web/Grand.Web/Models/Catalog/CategorySimpleModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CategorySimpleModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CollectionModel.cs b/src/Web/Grand.Web/Models/Catalog/CollectionModel.cs
index 593c02043..66bbd4e4b 100644
--- a/src/Web/Grand.Web/Models/Catalog/CollectionModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CollectionModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CollectionNavigationModel.cs b/src/Web/Grand.Web/Models/Catalog/CollectionNavigationModel.cs
index e74769d11..52cd008f7 100644
--- a/src/Web/Grand.Web/Models/Catalog/CollectionNavigationModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CollectionNavigationModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CompareProductsModel.cs b/src/Web/Grand.Web/Models/Catalog/CompareProductsModel.cs
index 262e375c4..26ee179c7 100644
--- a/src/Web/Grand.Web/Models/Catalog/CompareProductsModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CompareProductsModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs b/src/Web/Grand.Web/Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs
index ee232d091..59e14bd5f 100644
--- a/src/Web/Grand.Web/Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/MenuModel.cs b/src/Web/Grand.Web/Models/Catalog/MenuModel.cs
index 984cc7a6f..b2f66c39e 100644
--- a/src/Web/Grand.Web/Models/Catalog/MenuModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/MenuModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/PopularProductTagsModel.cs b/src/Web/Grand.Web/Models/Catalog/PopularProductTagsModel.cs
index b923513d7..14b680430 100644
--- a/src/Web/Grand.Web/Models/Catalog/PopularProductTagsModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/PopularProductTagsModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductDetailsAttributeChangeModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductDetailsAttributeChangeModel.cs
index f6c53c520..a23c22870 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductDetailsAttributeChangeModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductDetailsAttributeChangeModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
index 658050457..1ebaebba9 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
@@ -5,8 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Web.Models.Media;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
index 357ee10b7..6be08b305 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
@@ -3,8 +3,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Tax;
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductReviewModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductReviewModel.cs
index 88f4e641f..dfd60217f 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductReviewModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductReviewModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductsByTagModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductsByTagModel.cs
index a9007fb18..491d69ab7 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductsByTagModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductsByTagModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/SearchBoxModel.cs b/src/Web/Grand.Web/Models/Catalog/SearchBoxModel.cs
index 8b389018c..322ca3f75 100644
--- a/src/Web/Grand.Web/Models/Catalog/SearchBoxModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/SearchBoxModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/SearchModel.cs b/src/Web/Grand.Web/Models/Catalog/SearchModel.cs
index e1d88a3bd..544409f6a 100644
--- a/src/Web/Grand.Web/Models/Catalog/SearchModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/SearchModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/VendorModel.cs b/src/Web/Grand.Web/Models/Catalog/VendorModel.cs
index 50f62633f..6270cf676 100644
--- a/src/Web/Grand.Web/Models/Catalog/VendorModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/VendorModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
using Grand.Web.Models.Vendors;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Catalog/VendorNavigationModel.cs b/src/Web/Grand.Web/Models/Catalog/VendorNavigationModel.cs
index 647509ff1..45961db63 100644
--- a/src/Web/Grand.Web/Models/Catalog/VendorNavigationModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/VendorNavigationModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Catalog
{
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
index e816d54e7..c226fa9e4 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutConfirmModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutConfirmModel.cs
index dc51364ec..99151bd4a 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutConfirmModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutConfirmModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutPaymentMethodModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutPaymentMethodModel.cs
index e591ea147..6fc40aadc 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutPaymentMethodModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutPaymentMethodModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
index ad4a00d66..a7a718883 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingMethodModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingMethodModel.cs
index fc96a29ba..ae582cc96 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingMethodModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingMethodModel.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Shipping;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Checkout
{
diff --git a/src/Web/Grand.Web/Models/Common/AddressAttributeModel.cs b/src/Web/Grand.Web/Models/Common/AddressAttributeModel.cs
index 5971b2798..0c0a02248 100644
--- a/src/Web/Grand.Web/Models/Common/AddressAttributeModel.cs
+++ b/src/Web/Grand.Web/Models/Common/AddressAttributeModel.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Common
{
diff --git a/src/Web/Grand.Web/Models/Common/AddressModel.cs b/src/Web/Grand.Web/Models/Common/AddressModel.cs
index 5ad447498..80cd90f22 100644
--- a/src/Web/Grand.Web/Models/Common/AddressModel.cs
+++ b/src/Web/Grand.Web/Models/Common/AddressModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Common
diff --git a/src/Web/Grand.Web/Models/Common/ContactUsModel.cs b/src/Web/Grand.Web/Models/Common/ContactUsModel.cs
index 5494eef01..95ff2348c 100644
--- a/src/Web/Grand.Web/Models/Common/ContactUsModel.cs
+++ b/src/Web/Grand.Web/Models/Common/ContactUsModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
using Grand.Domain.Common;
namespace Grand.Web.Models.Common
diff --git a/src/Web/Grand.Web/Models/Common/FooterModel.cs b/src/Web/Grand.Web/Models/Common/FooterModel.cs
index 95d288a8b..31e07e3f8 100644
--- a/src/Web/Grand.Web/Models/Common/FooterModel.cs
+++ b/src/Web/Grand.Web/Models/Common/FooterModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Common
{
diff --git a/src/Web/Grand.Web/Models/Common/SitemapModel.cs b/src/Web/Grand.Web/Models/Common/SitemapModel.cs
index ed07720c7..40d5695ca 100644
--- a/src/Web/Grand.Web/Models/Common/SitemapModel.cs
+++ b/src/Web/Grand.Web/Models/Common/SitemapModel.cs
@@ -3,7 +3,6 @@ using Grand.Web.Models.Catalog;
using Grand.Web.Models.Pages;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Knowledgebase;
-using System.Collections.Generic;
namespace Grand.Web.Models.Common
{
diff --git a/src/Web/Grand.Web/Models/Course/CourseModel.cs b/src/Web/Grand.Web/Models/Course/CourseModel.cs
index 387c27672..e72e49f8a 100644
--- a/src/Web/Grand.Web/Models/Course/CourseModel.cs
+++ b/src/Web/Grand.Web/Models/Course/CourseModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Course
{
diff --git a/src/Web/Grand.Web/Models/Customer/CoursesModel.cs b/src/Web/Grand.Web/Models/Customer/CoursesModel.cs
index d5413f056..ba70dd759 100644
--- a/src/Web/Grand.Web/Models/Customer/CoursesModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CoursesModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerAddressListModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerAddressListModel.cs
index 381792af6..d067a03e4 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerAddressListModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerAddressListModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerAttributeModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerAttributeModel.cs
index 95bbdae30..f559e9b92 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerAttributeModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerAttributeModel.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Catalog;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerAuctionsModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerAuctionsModel.cs
index fcd34d425..5d4c94bc4 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerAuctionsModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerAuctionsModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerDownloadableProductsModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerDownloadableProductsModel.cs
index 37be67cd6..893ae4aae 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerDownloadableProductsModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerDownloadableProductsModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs
index 92922c17d..04984685e 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs
@@ -3,8 +3,6 @@ using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Models.Newsletter;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Customer
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerNotesModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerNotesModel.cs
index 6eb19bd52..2722e3927 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerNotesModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerNotesModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/CustomerProductReviewModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerProductReviewModel.cs
index d0db1e822..92a527d68 100644
--- a/src/Web/Grand.Web/Models/Customer/CustomerProductReviewModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/CustomerProductReviewModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/DocumentsModel.cs b/src/Web/Grand.Web/Models/Customer/DocumentsModel.cs
index 71a1a2942..68d8116a3 100644
--- a/src/Web/Grand.Web/Models/Customer/DocumentsModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/DocumentsModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Customer
{
diff --git a/src/Web/Grand.Web/Models/Customer/RegisterModel.cs b/src/Web/Grand.Web/Models/Customer/RegisterModel.cs
index 2bde76566..0092812e9 100644
--- a/src/Web/Grand.Web/Models/Customer/RegisterModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/RegisterModel.cs
@@ -2,8 +2,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Newsletter;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Customer
diff --git a/src/Web/Grand.Web/Models/Install/InstallModel.cs b/src/Web/Grand.Web/Models/Install/InstallModel.cs
index 4e529dcbb..38b50c49b 100644
--- a/src/Web/Grand.Web/Models/Install/InstallModel.cs
+++ b/src/Web/Grand.Web/Models/Install/InstallModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Data;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Install
diff --git a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleCommentModel.cs b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleCommentModel.cs
index 0a12406fb..0ae9c30df 100644
--- a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleCommentModel.cs
+++ b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleCommentModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Models.Knowledgebase
{
diff --git a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs
index 8034cdc52..e7d36156e 100644
--- a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs
+++ b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Knowledgebase
{
diff --git a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseCategoryModel.cs b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
index 476df74d3..074e424a0 100644
--- a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
+++ b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseCategoryModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Knowledgebase
{
diff --git a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseHomePageModel.cs b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseHomePageModel.cs
index eeb3464ef..efc4ad5cb 100644
--- a/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseHomePageModel.cs
+++ b/src/Web/Grand.Web/Models/Knowledgebase/KnowledgebaseHomePageModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Knowledgebase
{
diff --git a/src/Web/Grand.Web/Models/News/HomePageNewsItemsModel.cs b/src/Web/Grand.Web/Models/News/HomePageNewsItemsModel.cs
index e9fe0cd53..5658da573 100644
--- a/src/Web/Grand.Web/Models/News/HomePageNewsItemsModel.cs
+++ b/src/Web/Grand.Web/Models/News/HomePageNewsItemsModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.News
{
diff --git a/src/Web/Grand.Web/Models/News/NewsCommentModel.cs b/src/Web/Grand.Web/Models/News/NewsCommentModel.cs
index 3d680e50f..a88d4c591 100644
--- a/src/Web/Grand.Web/Models/News/NewsCommentModel.cs
+++ b/src/Web/Grand.Web/Models/News/NewsCommentModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Models.News
{
diff --git a/src/Web/Grand.Web/Models/News/NewsItemListModel.cs b/src/Web/Grand.Web/Models/News/NewsItemListModel.cs
index 99d433b3d..654dd9981 100644
--- a/src/Web/Grand.Web/Models/News/NewsItemListModel.cs
+++ b/src/Web/Grand.Web/Models/News/NewsItemListModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.News
{
diff --git a/src/Web/Grand.Web/Models/News/NewsItemModel.cs b/src/Web/Grand.Web/Models/News/NewsItemModel.cs
index e6a196b39..4170c0f14 100644
--- a/src/Web/Grand.Web/Models/News/NewsItemModel.cs
+++ b/src/Web/Grand.Web/Models/News/NewsItemModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.News
{
diff --git a/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs b/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
index cd46e0c1b..66a9c0868 100644
--- a/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
+++ b/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Newsletter
{
diff --git a/src/Web/Grand.Web/Models/Orders/CustomerLoyaltyPointsModel.cs b/src/Web/Grand.Web/Models/Orders/CustomerLoyaltyPointsModel.cs
index 5bea33cad..d4f61e174 100644
--- a/src/Web/Grand.Web/Models/Orders/CustomerLoyaltyPointsModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/CustomerLoyaltyPointsModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/CustomerMerchandiseReturnsModel.cs b/src/Web/Grand.Web/Models/Orders/CustomerMerchandiseReturnsModel.cs
index be71db092..dac82e87f 100644
--- a/src/Web/Grand.Web/Models/Orders/CustomerMerchandiseReturnsModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/CustomerMerchandiseReturnsModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/CustomerOrderListModel.cs b/src/Web/Grand.Web/Models/Orders/CustomerOrderListModel.cs
index d8b521ddb..8de7748d1 100644
--- a/src/Web/Grand.Web/Models/Orders/CustomerOrderListModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/CustomerOrderListModel.cs
@@ -1,6 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnDetailsModel.cs b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnDetailsModel.cs
index a6a95c114..1830b3420 100644
--- a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnDetailsModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnDetailsModel.cs
@@ -1,8 +1,6 @@
using Grand.Domain.Orders;
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs
index 6c08df552..e3a48d719 100644
--- a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/OrderDetailsModel.cs b/src/Web/Grand.Web/Models/Orders/OrderDetailsModel.cs
index 1742db04a..82be431b7 100644
--- a/src/Web/Grand.Web/Models/Orders/OrderDetailsModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/OrderDetailsModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
using Grand.Web.Models.Media;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Orders/ShipmentDetailsModel.cs b/src/Web/Grand.Web/Models/Orders/ShipmentDetailsModel.cs
index 7674f91fc..93d76e2db 100644
--- a/src/Web/Grand.Web/Models/Orders/ShipmentDetailsModel.cs
+++ b/src/Web/Grand.Web/Models/Orders/ShipmentDetailsModel.cs
@@ -1,7 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.Orders
{
diff --git a/src/Web/Grand.Web/Models/Pages/PageModel.cs b/src/Web/Grand.Web/Models/Pages/PageModel.cs
index 2971dfc9d..42e217209 100644
--- a/src/Web/Grand.Web/Models/Pages/PageModel.cs
+++ b/src/Web/Grand.Web/Models/Pages/PageModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System;
namespace Grand.Web.Models.Pages
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/AddToCartModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/AddToCartModel.cs
index bef20e5ad..ab2f23ee6 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/AddToCartModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/AddToCartModel.cs
@@ -1,7 +1,6 @@
using Grand.Domain.Orders;
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/EstimateShippingModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/EstimateShippingModel.cs
index ef65b4a02..450bd8207 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/EstimateShippingModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/EstimateShippingModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/MiniShoppingCartModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
index 8987d5138..a2166a621 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
-using System.Collections.Generic;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/OrderTotalsModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/OrderTotalsModel.cs
index 18b889f83..43bbb2af8 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/OrderTotalsModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/OrderTotalsModel.cs
@@ -1,5 +1,4 @@
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/ShoppingCartModel.cs
index 635599363..ddaf70722 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/ShoppingCartModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/ShoppingCartModel.cs
@@ -3,7 +3,6 @@ using Grand.Infrastructure.Models;
using Grand.Web.Models.Common;
using Grand.Web.Models.Media;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/WishlistModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/WishlistModel.cs
index bae8cd532..dd550775c 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/WishlistModel.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/WishlistModel.cs
@@ -1,8 +1,6 @@
using Grand.Infrastructure.Models;
using Grand.Web.Models.Media;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
-using System.Collections.Generic;
namespace Grand.Web.Models.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Models/Vendors/VendorAddressModel.cs b/src/Web/Grand.Web/Models/Vendors/VendorAddressModel.cs
index 87bfd8fa3..8ba3168ec 100644
--- a/src/Web/Grand.Web/Models/Vendors/VendorAddressModel.cs
+++ b/src/Web/Grand.Web/Models/Vendors/VendorAddressModel.cs
@@ -1,7 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Vendors
diff --git a/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs b/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs
index d772e9e97..3a2e620c4 100644
--- a/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs
+++ b/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs
@@ -1,6 +1,5 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
-using System.Collections.Generic;
namespace Grand.Web.Models.Vendors
{
diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.cs
index afff8048f..9078d975b 100644
--- a/src/Web/Grand.Web/Program.cs
+++ b/src/Web/Grand.Web/Program.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Serilog;
-using System.Text;
var builder = WebApplication.CreateBuilder(args);
diff --git a/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs b/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
index 94c4c39f2..48e81b49f 100644
--- a/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
+++ b/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Blogs;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Blogs
{
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
index 076c978e9..90c41eab3 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Catalog
{
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
index eb2c2233a..17326946f 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Catalog
{
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
index 80aecce43..be156c964 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Catalog
{
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
index 9e1a32cc8..384804566 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Catalog;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Catalog
{
diff --git a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
index 2f2546431..cf3fa6fb0 100644
--- a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
@@ -4,9 +4,6 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Validators.Common
{
diff --git a/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs b/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
index 50fc1754d..d232db76f 100644
--- a/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Common
{
diff --git a/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs b/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
index a7affaeaf..5cea1e0a6 100644
--- a/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Common
{
diff --git a/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs b/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
index 7d719e79a..8d3d9c8b8 100644
--- a/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Orders;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
index 87b81ba99..2674d7aa6 100644
--- a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
index b1316a9fc..a52a233c9 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Checkout;
using Grand.Web.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
index eaae7583d..6d428e1fd 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Checkout;
using Grand.Web.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
index 903a12559..59a251c1e 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
@@ -4,7 +4,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
using Grand.Web.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
index 2213bcf9a..6cb21a04a 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
@@ -4,10 +4,7 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System;
-using System.Collections.Generic;
using Grand.SharedKernel.Extensions;
-using System.Linq;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
index 0129a4041..82370de0c 100644
--- a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
index 9dbbaa542..7bdc99a54 100644
--- a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
index 9a1da022b..6d9f6a785 100644
--- a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
index c34da8cfd..c82c4d3b4 100644
--- a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
index ca4ad6003..ab4b6135b 100644
--- a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
@@ -4,10 +4,7 @@ using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System;
-using System.Collections.Generic;
using Grand.SharedKernel.Extensions;
-using System.Linq;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs b/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
index fc4a1cbad..569edd63b 100644
--- a/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
@@ -3,7 +3,6 @@ using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Customer;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Customer
{
diff --git a/src/Web/Grand.Web/Validators/Install/InstallValidator.cs b/src/Web/Grand.Web/Validators/Install/InstallValidator.cs
index bef4498c0..13be81abd 100644
--- a/src/Web/Grand.Web/Validators/Install/InstallValidator.cs
+++ b/src/Web/Grand.Web/Validators/Install/InstallValidator.cs
@@ -1,7 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
using Grand.Web.Models.Install;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Install
{
diff --git a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
index 9b3a22281..d983e2fb1 100644
--- a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
+++ b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Knowledgebase;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Knowledgebase
{
diff --git a/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs b/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
index 6cf2a25d0..b44ed4b99 100644
--- a/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
+++ b/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.News;
-using System.Collections.Generic;
namespace Grand.Web.Validators.News
{
diff --git a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
index 1815e9c08..df5bcc5ad 100644
--- a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
+++ b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.ShoppingCart;
-using System.Collections.Generic;
namespace Grand.Web.Validators.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs b/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
index cd0a08ad7..ed847e2b3 100644
--- a/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
@@ -5,7 +5,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Vendors;
using Grand.Web.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Vendors
{
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
index e8789b7c5..4318736d3 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
@@ -4,8 +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.Collections.Generic;
-using System.Linq;
namespace Grand.Web.Validators.Common
{
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
index 3a75b8725..2cad7784a 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
@@ -5,7 +5,6 @@ using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Vendors;
using Grand.Web.Validators.Common;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Vendors
{
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
index 061fd00f9..a3fa62d61 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
@@ -2,7 +2,6 @@
using Grand.Infrastructure.Validators;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Web.Models.Vendors;
-using System.Collections.Generic;
namespace Grand.Web.Validators.Vendors
{