diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
index 6336a66a..2e767fc4 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
@@ -16,7 +16,6 @@
 using Squidex.CLI.Commands.Implementation;
 using Squidex.CLI.Commands.Models;
 using Squidex.CLI.Configuration;
-using Squidex.ClientLibrary;
 using Squidex.ClientLibrary.Management;
 
 #pragma warning disable IDE0059 // Value assigned to symbol is never used
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ILogger.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ILogger.cs
index d600f6a2..b28efee9 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ILogger.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ILogger.cs
@@ -5,8 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using System;
-
 namespace Squidex.CLI.Commands.Implementation
 {
     public interface ILogger
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ImExport/JsonMapping.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ImExport/JsonMapping.cs
index 560873af..9dcb7617 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ImExport/JsonMapping.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/ImExport/JsonMapping.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using Squidex.ClientLibrary;
 
 namespace Squidex.CLI.Commands.Implementation.ImExport
 {
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Models/SchemaWithRefs.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Models/SchemaWithRefs.cs
index b231cddc..ac1194e9 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/Models/SchemaWithRefs.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/Models/SchemaWithRefs.cs
@@ -9,7 +9,6 @@
 using System.IO;
 using Newtonsoft.Json;
 using Squidex.CLI.Commands.Implementation;
-using Squidex.ClientLibrary;
 
 namespace Squidex.CLI.Commands.Models
 {
diff --git a/cli/Squidex.CLI/Squidex.CLI/Configuration/GetOnlyHttpClient.cs b/cli/Squidex.CLI/Squidex.CLI/Configuration/GetOnlyHttpClient.cs
index fc1aa707..3294602f 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Configuration/GetOnlyHttpClient.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Configuration/GetOnlyHttpClient.cs
@@ -5,10 +5,10 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using System;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Squidex.CLI.Commands.Implementation;
 
 namespace Squidex.CLI.Configuration
 {
@@ -23,7 +23,7 @@ public override HttpResponseMessage Send(HttpRequestMessage request, Cancellatio
         {
             if (request.Method != HttpMethod.Get)
             {
-                throw new InvalidOperationException("Not possible in emulation mode.");
+                throw new CLIException("Emulated");
             }
 
             return base.Send(request, cancellationToken);
@@ -33,7 +33,7 @@ public override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
         {
             if (request.Method != HttpMethod.Get)
             {
-                throw new InvalidOperationException("Not possible in emulation mode.");
+                throw new CLIException("Emulated");
             }
 
             return base.SendAsync(request, cancellationToken);