diff --git a/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs b/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs
index 346531583..a0e61d0c5 100644
--- a/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs
+++ b/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs
@@ -12,6 +12,7 @@ using Microsoft.Extensions.Caching.Memory;
 using Squidex.Infrastructure;
 using Squidex.Read.Apps.Repositories;
 using Squidex.Read.Utils;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Read.Apps.Services.Implementations
diff --git a/src/Squidex.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs b/src/Squidex.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs
index 4dde39293..6d6d503d1 100644
--- a/src/Squidex.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs
+++ b/src/Squidex.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  EntityWithSchema.cs
+//  ISchemaEntityWithSchema.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/src/Squidex.Store.MongoDb/Infrastructure/MongoStreamPositionStorage.cs b/src/Squidex.Store.MongoDb/Infrastructure/MongoStreamPositionStorage.cs
index 3c8c9f92a..e3c74a8d1 100644
--- a/src/Squidex.Store.MongoDb/Infrastructure/MongoStreamPositionStorage.cs
+++ b/src/Squidex.Store.MongoDb/Infrastructure/MongoStreamPositionStorage.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  MongoPositionStorage.cs
+//  MongoStreamPositionStorage.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/src/Squidex/Configurations/Constants.cs b/src/Squidex/Configurations/Constants.cs
index 0d42e3808..3a586642b 100644
--- a/src/Squidex/Configurations/Constants.cs
+++ b/src/Squidex/Configurations/Constants.cs
@@ -5,7 +5,6 @@
 //  Copyright (c) Squidex Group
 //  All rights reserved.
 // ==========================================================================
-
 namespace Squidex.Configurations
 {
     public class Constants
diff --git a/src/Squidex/Configurations/Identity/IdentityServices.cs b/src/Squidex/Configurations/Identity/IdentityServices.cs
index 948603232..24e4f52c6 100644
--- a/src/Squidex/Configurations/Identity/IdentityServices.cs
+++ b/src/Squidex/Configurations/Identity/IdentityServices.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  IdentityDependencies.cs
+//  IdentityServices.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/src/Squidex/Configurations/Identity/MyIdentityOptions.cs b/src/Squidex/Configurations/Identity/MyIdentityOptions.cs
index fce5cae55..de266618e 100644
--- a/src/Squidex/Configurations/Identity/MyIdentityOptions.cs
+++ b/src/Squidex/Configurations/Identity/MyIdentityOptions.cs
@@ -5,7 +5,6 @@
 //  Copyright (c) Squidex Group
 //  All rights reserved.
 // ==========================================================================
-
 namespace Squidex.Configurations.Identity
 {
     public sealed class MyIdentityOptions
diff --git a/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs b/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs
index 6d37ea313..7e4641e9b 100644
--- a/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs
+++ b/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs
@@ -5,7 +5,6 @@
 //  Copyright (c) Squidex Group
 //  All rights reserved.
 // ==========================================================================
-
 namespace Squidex.Modules.Api.Apps.Models
 {
     public sealed class CreateAppDto
diff --git a/src/Squidex/Modules/Api/EntityCreatedDto.cs b/src/Squidex/Modules/Api/EntityCreatedDto.cs
index 3d89afb15..960e4000a 100644
--- a/src/Squidex/Modules/Api/EntityCreatedDto.cs
+++ b/src/Squidex/Modules/Api/EntityCreatedDto.cs
@@ -5,7 +5,6 @@
 //  Copyright (c) Squidex Group
 //  All rights reserved.
 // ==========================================================================
-
 namespace Squidex.Modules.Api
 {
     public class EntityCreatedDto
diff --git a/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs b/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs
index 97708ec34..48e2faf64 100644
--- a/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs
+++ b/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs
@@ -20,7 +20,7 @@ namespace Squidex.Modules.Api.Schemas
     [Authorize]
     [ApiExceptionFilter]
     [ServiceFilter(typeof(AppFilterAttribute))]
-    [Route("api/apps/{app}")]
+    [Route("apps/{app}")]
     public class SchemasFieldsController : ControllerBase
     {
         public SchemasFieldsController(ICommandBus commandBus)
diff --git a/src/Squidex/Modules/Api/Schemas/SchemasController.cs b/src/Squidex/Modules/Api/Schemas/SchemasController.cs
index 39b5e5e95..00cdd936e 100644
--- a/src/Squidex/Modules/Api/Schemas/SchemasController.cs
+++ b/src/Squidex/Modules/Api/Schemas/SchemasController.cs
@@ -24,7 +24,8 @@ namespace Squidex.Modules.Api.Schemas
 {
     [Authorize]
     [ApiExceptionFilter]
-    [DeactivateForAppDomain]
+    [ServiceFilter(typeof(AppFilterAttribute))]
+    [Route("apps/{app}")]
     public class SchemasController : ControllerBase
     {
         private readonly ISchemaRepository schemaRepository;
@@ -36,7 +37,7 @@ namespace Squidex.Modules.Api.Schemas
         }
 
         [HttpGet]
-        [Route("api/schemas/")]
+        [Route("schemas/")]
         public async Task<List<ListSchemaDto>> Query()
         {
             var schemas = await schemaRepository.QueryAllAsync(AppId);
@@ -45,7 +46,7 @@ namespace Squidex.Modules.Api.Schemas
         }
 
         [HttpGet]
-        [Route("api/schemas/{name}/")]
+        [Route("schemas/{name}/")]
         public async Task<ActionResult> Get(string name)
         {
             var entity = await schemaRepository.FindSchemaAsync(AppId, name);
@@ -59,7 +60,7 @@ namespace Squidex.Modules.Api.Schemas
         }
 
         [HttpPost]
-        [Route("api/schemas/")]
+        [Route("schemas/")]
         public async Task<ActionResult> Create([FromBody] CreateSchemaDto model)
         {
             var command = SimpleMapper.Map(model, new CreateSchema { AggregateId = Guid.NewGuid() });
@@ -70,7 +71,7 @@ namespace Squidex.Modules.Api.Schemas
         }
 
         [HttpPut]
-        [Route("api/schemas/{name}/")]
+        [Route("schemas/{name}/")]
         public async Task<ActionResult> Update(string name, [FromBody] UpdateSchemaDto model)
         {
             var command = SimpleMapper.Map(model, new UpdateSchema());
@@ -81,7 +82,7 @@ namespace Squidex.Modules.Api.Schemas
         }
 
         [HttpDelete]
-        [Route("api/schemas/{name}/")]
+        [Route("schemas/{name}/")]
         public async Task<ActionResult> Delete(string name)
         {
             await CommandBus.PublishAsync(new DeleteSchema());
diff --git a/src/Squidex/Modules/UI/Account/AccountController.cs b/src/Squidex/Modules/UI/Account/AccountController.cs
index e4dce6e7a..b702eb986 100644
--- a/src/Squidex/Modules/UI/Account/AccountController.cs
+++ b/src/Squidex/Modules/UI/Account/AccountController.cs
@@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.MongoDB;
 using Microsoft.AspNetCore.Mvc;
+
 // ReSharper disable RedundantIfElseBlock
 // ReSharper disable ConvertIfStatementToReturnStatement
 
diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
index 5b14413c1..6fb9e96c9 100644
--- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
+++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  ExceptionFilter.cs
+//  ApiExceptionFilterAttribute.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/src/Squidex/Pipeline/AppFilterAttribute.cs b/src/Squidex/Pipeline/AppFilterAttribute.cs
index 143ca8185..d484613b0 100644
--- a/src/Squidex/Pipeline/AppFilterAttribute.cs
+++ b/src/Squidex/Pipeline/AppFilterAttribute.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  AppMiddleware.cs
+//  AppFilterAttribute.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/src/Squidex/Pipeline/DeactivateForAppDomainAttribute.cs b/src/Squidex/Pipeline/DeactivateForAppDomainAttribute.cs
deleted file mode 100644
index 988f3ef91..000000000
--- a/src/Squidex/Pipeline/DeactivateForAppDomainAttribute.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// ==========================================================================
-//  DeactivateForAppDomainAttribute.cs
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex Group
-//  All rights reserved.
-// ==========================================================================
-
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace Squidex.Pipeline
-{
-    public sealed class DeactivateForAppDomainAttribute : ActionFilterAttribute
-    {
-        public override void OnActionExecuting(ActionExecutingContext context)
-        {
-            var app = context.HttpContext.Features.Get<IAppFeature>();
-
-            if (app != null)
-            {
-                context.Result = new NotFoundResult();
-            }
-        }
-    }
-}
diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs
index 2b8ea00a4..dcf3b92dd 100644
--- a/src/Squidex/Startup.cs
+++ b/src/Squidex/Startup.cs
@@ -12,6 +12,7 @@ using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,7 +23,7 @@ using Squidex.Configurations.Identity;
 using Squidex.Configurations.Web;
 using Squidex.Store.MongoDb;
 using System.Linq;
-using Microsoft.AspNetCore.Http;
+
 // ReSharper disable ConvertClosureToMethodGroup
 // ReSharper disable AccessToModifiedClosure
 
diff --git a/tests/Squidex.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs b/tests/Squidex.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs
index 1b1164cbf..90b1dc482 100644
--- a/tests/Squidex.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs
+++ b/tests/Squidex.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs
@@ -6,8 +6,6 @@
 //  All rights reserved.
 // ==========================================================================
 
-// ReSharper disable ValueParameterNotUsed
-
 using System;
 using System.Linq;
 using Xunit;
diff --git a/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs b/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs
index f90599d16..625729b86 100644
--- a/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs
+++ b/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  AppDomainObjectTest.cs
+//  AppDomainObjectTests.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
@@ -7,13 +7,13 @@
 // ==========================================================================
 
 using System;
+using System.Linq;
+using FluentAssertions;
+using Squidex.Events.Apps;
 using Squidex.Infrastructure;
 using Squidex.Write.Apps;
 using Squidex.Write.Apps.Commands;
 using Xunit;
-using System.Linq;
-using FluentAssertions;
-using Squidex.Events.Apps;
 
 namespace Squidex.Write.Tests.Apps
 {
diff --git a/tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs b/tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs
index 9c42b5747..9b04bf120 100644
--- a/tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs
+++ b/tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  SchemaDomainObjectTest.cs
+//  SchemaDomainObjectTests.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
diff --git a/tests/Squidex.Write.Tests/Utils/SchemaFixture.cs b/tests/Squidex.Write.Tests/Utils/SchemaFixture.cs
index b47d32fe9..d45211029 100644
--- a/tests/Squidex.Write.Tests/Utils/SchemaFixture.cs
+++ b/tests/Squidex.Write.Tests/Utils/SchemaFixture.cs
@@ -6,9 +6,9 @@
 //  All rights reserved.
 // ==========================================================================
 
+using System.Reflection;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure;
-using System.Reflection;
 using Xunit;
 
 namespace Squidex.Write.Tests.Utils