diff --git a/src/PublicApi/Startup.cs b/src/PublicApi/Startup.cs
index 7818499..9d65a13 100644
--- a/src/PublicApi/Startup.cs
+++ b/src/PublicApi/Startup.cs
@@ -1,10 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
 using AutoMapper;
 using MediatR;
-
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -46,11 +43,9 @@ namespace Microsoft.eShopWeb.PublicApi
 
         private void ConfigureInMemoryDatabases(IServiceCollection services)
         {
-            // use in-memory database
             services.AddDbContext<CatalogContext>(c =>
                 c.UseInMemoryDatabase("Catalog"));
 
-            // Add Identity DbContext
             services.AddDbContext<AppIdentityDbContext>(options =>
                 options.UseInMemoryDatabase("Identity"));
 
@@ -91,27 +86,18 @@ namespace Microsoft.eShopWeb.PublicApi
             services.AddScoped(typeof(IAppLogger<>), typeof(LoggerAdapter<>));
             services.AddScoped<ITokenClaimsService, IdentityTokenClaimService>();
 
-            // Add memory cache services
             services.AddMemoryCache();
 
-            // https://stackoverflow.com/questions/46938248/asp-net-core-2-0-combining-cookies-and-bearer-authorization-for-the-same-endpoin
             var key = Encoding.ASCII.GetBytes(AuthorizationConstants.JWT_SECRET_KEY);
             services.AddAuthentication(config =>
             {
-                //config.DefaultScheme = "smart";
-                //config.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-                //config.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-
-                config.DefaultSignInScheme = JwtBearerDefaults.AuthenticationScheme;
-                config.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-                config.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
                 config.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
             })
-            .AddJwtBearer(x =>
+            .AddJwtBearer(config =>
             {
-                x.RequireHttpsMetadata = false;
-                x.SaveToken = true;
-                x.TokenValidationParameters = new TokenValidationParameters
+                config.RequireHttpsMetadata = false;
+                config.SaveToken = true;
+                config.TokenValidationParameters = new TokenValidationParameters
                 {
                     ValidateIssuerSigningKey = true,
                     IssuerSigningKey = new SymmetricSecurityKey(key),
diff --git a/src/Shared/Authorization/ClaimValue.cs b/src/Shared/Authorization/ClaimValue.cs
index b1b24c5..249507d 100644
--- a/src/Shared/Authorization/ClaimValue.cs
+++ b/src/Shared/Authorization/ClaimValue.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Authorization
+namespace Shared.Authorization
 {
     public class ClaimValue
     {
diff --git a/src/Shared/Authorization/UserInfo.cs b/src/Shared/Authorization/UserInfo.cs
index 9c4e2cc..bdf5c29 100644
--- a/src/Shared/Authorization/UserInfo.cs
+++ b/src/Shared/Authorization/UserInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Text;
+using System.Collections.Generic;
 
 namespace Shared.Authorization
 {
diff --git a/src/Web/Controllers/OrderController.cs b/src/Web/Controllers/OrderController.cs
index d88302a..4713a76 100644
--- a/src/Web/Controllers/OrderController.cs
+++ b/src/Web/Controllers/OrderController.cs
@@ -20,7 +20,7 @@ namespace Microsoft.eShopWeb.Web.Controllers
             _mediator = mediator;
         }
 
-        [HttpGet()]
+        [HttpGet]
         public async Task<IActionResult> MyOrders()
         {
             var viewModel = await _mediator.Send(new GetMyOrders(User.Identity.Name));