diff --git a/Admin/Installer.php b/Admin/Installer.php
index bbf7259..d8762ba 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -18,7 +18,6 @@ use Modules\Support\Models\SupportApp;
 use Modules\Support\Models\SupportAppMapper;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
 
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 7fea279..cabb124 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Support\Controller;
 
 use Modules\Admin\Models\NullAccount;
-use Modules\Support\Models\AttributeValueType;
 use Modules\Support\Models\NullSupportApp;
 use Modules\Support\Models\NullTicketAttributeType;
 use Modules\Support\Models\NullTicketAttributeValue;
@@ -25,7 +24,6 @@ use Modules\Support\Models\Ticket;
 use Modules\Support\Models\TicketAttribute;
 use Modules\Support\Models\TicketAttributeMapper;
 use Modules\Support\Models\TicketAttributeType;
-use Modules\Support\Models\TicketAttributeTypeL11n;
 use Modules\Support\Models\TicketAttributeTypeL11nMapper;
 use Modules\Support\Models\TicketAttributeTypeMapper;
 use Modules\Support\Models\TicketAttributeValue;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 2f3b0f1..415872b 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Support\Controller;
 
-use Model\NullSetting;
 use Model\SettingMapper;
 use Modules\Support\Models\SupportAppMapper;
 use Modules\Support\Models\TicketMapper;
diff --git a/Models/TicketAttributeTypeMapper.php b/Models/TicketAttributeTypeMapper.php
index ba65b9e..e8dd199 100755
--- a/Models/TicketAttributeTypeMapper.php
+++ b/Models/TicketAttributeTypeMapper.php
@@ -62,7 +62,7 @@ final class TicketAttributeTypeMapper extends DataMapperFactory
             'mapper'            => TicketAttributeValueMapper::class,
             'table'             => 'support_ticket_attr_default',
             'self'              => 'support_ticket_attr_default_type',
-            'external'          => 'support_ticket_attr_default_value'
+            'external'          => 'support_ticket_attr_default_value',
         ],
     ];
 
diff --git a/Models/TicketAttributeValue.php b/Models/TicketAttributeValue.php
index 5f77b78..712f215 100755
--- a/Models/TicketAttributeValue.php
+++ b/Models/TicketAttributeValue.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Support\Models;
 
 use phpOMS\Localization\BaseStringL11n;
-use phpOMS\Localization\ISO3166TwoEnum;
 use phpOMS\Localization\ISO639x1Enum;
 
 /**
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 9bdf39e..251bc2f 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -16,7 +16,7 @@ return ['Support' => [
     'Account'            => 'الحساب',
     'All'                => 'الجميع',
     'Assigned'           => '#VALUE!',
-    'AverageAmount'      => 'متوسط ​​المبلغ',
+    'AverageAmount'      => "متوسط \u{200b}\u{200b}المبلغ",
     'AverageProcessTime' => 'avg. وقت المعالجة',
     'Closed'             => '#VALUE!',
     'Completion'         => '#VALUE!',
diff --git a/Views/TicketView.php b/Views/TicketView.php
index 0039b65..5cd67e2 100755
--- a/Views/TicketView.php
+++ b/Views/TicketView.php
@@ -16,7 +16,6 @@ namespace Modules\Support\Views;
 
 use Modules\Media\Models\Media;
 use Modules\Media\Models\NullMedia;
-use Modules\Profile\Models\NullProfile;
 use Modules\Profile\Models\ProfileMapper;
 use Modules\Tasks\Models\TaskStatus;
 use phpOMS\Localization\L11nManager;
diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php
index c535675..ac6989f 100755
--- a/tests/Controller/Api/ApiControllerAttributeTrait.php
+++ b/tests/Controller/Api/ApiControllerAttributeTrait.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Support\tests\Controller\Api;
 
-use Modules\Support\Models\AttributeValueType;
 use phpOMS\Localization\ISO3166TwoEnum;
 use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 13aec8f..1775cf5 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -55,13 +55,13 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
             protected string $appName = 'Api';
         };
 
-        $this->app->dbPool         = $GLOBALS['dbpool'];
+        $this->app->dbPool          = $GLOBALS['dbpool'];
         $this->app->unitId          = 1;
-        $this->app->accountManager = new AccountManager($GLOBALS['session']);
-        $this->app->appSettings    = new CoreSettings();
-        $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
-        $this->app->dispatcher     = new Dispatcher($this->app);
-        $this->app->eventManager   = new EventManager($this->app->dispatcher);
+        $this->app->accountManager  = new AccountManager($GLOBALS['session']);
+        $this->app->appSettings     = new CoreSettings();
+        $this->app->moduleManager   = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
+        $this->app->dispatcher      = new Dispatcher($this->app);
+        $this->app->eventManager    = new EventManager($this->app->dispatcher);
         $this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php');
         $this->app->sessionManager = new HttpSession(36000);
         $this->app->l11nManager    = new L11nManager();