diff --git a/app/Helpers/DateHelper.php b/app/Helpers/DateHelper.php
index 7e47a6223..cfdb4b04e 100644
--- a/app/Helpers/DateHelper.php
+++ b/app/Helpers/DateHelper.php
@@ -257,7 +257,7 @@ class DateHelper
      * @param  string $interval
      * @return Carbon
      */
-    public static function getNextTheoriticalBillingDate(String $interval) : Carbon
+    public static function getNextTheoriticalBillingDate(string $interval) : Carbon
     {
         if ($interval == 'monthly') {
             return now(static::getTimezone())->addMonth();
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index d4d19b103..110655fee 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -9,7 +9,6 @@ use App\Helpers\RequestHelper;
 use App\Jobs\SendNewUserAlert;
 use App\Models\Account\Account;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
diff --git a/app/Http/Controllers/ChangelogController.php b/app/Http/Controllers/ChangelogController.php
index 5dc24bfdf..809d22f51 100644
--- a/app/Http/Controllers/ChangelogController.php
+++ b/app/Http/Controllers/ChangelogController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Models\User\Changelog;
 use App\Helpers\InstanceHelper;
 
 class ChangelogController extends Controller
diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index f1ad3ebef..35d1d6c4c 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -11,7 +11,6 @@ use App\Helpers\AvatarHelper;
 use App\Helpers\LocaleHelper;
 use App\Helpers\SearchHelper;
 use App\Helpers\GendersHelper;
-use App\Models\Contact\Gender;
 use App\Models\Contact\Contact;
 use App\Services\VCard\ExportVCard;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php
index 48e7308ae..11065be09 100644
--- a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php
+++ b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\DAV\Backend\CalDAV;
 
-use Sabre\DAV;
 use App\Models\Contact\Contact;
 use Illuminate\Support\Facades\Log;
 use App\Models\Instance\SpecialDate;
diff --git a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php
index 19c9a700e..708603171 100644
--- a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php
+++ b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\DAV\Backend\CalDAV;
 
-use Sabre\DAV;
 use Illuminate\Support\Arr;
 use App\Models\Contact\Task;
 use App\Services\Task\DestroyTask;
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 23a885340..8da993c64 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -8,7 +8,6 @@ use App\Models\Contact\Debt;
 use Illuminate\Http\Request;
 use function Safe\json_encode;
 use App\Helpers\InstanceHelper;
-use App\Models\Contact\Contact;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Resources\Debt\Debt as DebtResource;
diff --git a/database/seeds/CurrenciesTableSeeder.php b/database/seeds/CurrenciesTableSeeder.php
index d7461ab65..f6ac2198f 100644
--- a/database/seeds/CurrenciesTableSeeder.php
+++ b/database/seeds/CurrenciesTableSeeder.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use function Safe\json_decode;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
diff --git a/tests/Api/Account/ApiUserControllerTest.php b/tests/Api/Account/ApiUserControllerTest.php
index e68d107f6..1290880a9 100644
--- a/tests/Api/Account/ApiUserControllerTest.php
+++ b/tests/Api/Account/ApiUserControllerTest.php
@@ -3,7 +3,6 @@
 namespace Tests\Api\Account;
 
 use Tests\ApiTestCase;
-use App\Models\User\User;
 use App\Models\Settings\Term;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
diff --git a/tests/Api/ApiJournalTest.php b/tests/Api/ApiJournalTest.php
index 47b2d5c3b..47841f96f 100644
--- a/tests/Api/ApiJournalTest.php
+++ b/tests/Api/ApiJournalTest.php
@@ -4,7 +4,6 @@ namespace Tests\Api;
 
 use Tests\ApiTestCase;
 use App\Models\Journal\Entry;
-use App\Models\Account\Account;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ApiJournalTest extends ApiTestCase
diff --git a/tests/Api/ApiTagControllerTest.php b/tests/Api/ApiTagControllerTest.php
index 11e46a03f..2d9820ad9 100644
--- a/tests/Api/ApiTagControllerTest.php
+++ b/tests/Api/ApiTagControllerTest.php
@@ -4,7 +4,6 @@ namespace Tests\Api;
 
 use Tests\ApiTestCase;
 use App\Models\Contact\Tag;
-use App\Models\Account\Account;
 use App\Models\Contact\Contact;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
diff --git a/tests/Commands/ImportCSVTest.php b/tests/Commands/ImportCSVTest.php
index a72514a33..df380116f 100644
--- a/tests/Commands/ImportCSVTest.php
+++ b/tests/Commands/ImportCSVTest.php
@@ -4,7 +4,6 @@ namespace Tests\Commands;
 
 use Mockery as m;
 use Tests\TestCase;
-use App\Models\User\User;
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Commands/ImportVCardsTest.php b/tests/Commands/ImportVCardsTest.php
index 269709c8a..70a1cee05 100644
--- a/tests/Commands/ImportVCardsTest.php
+++ b/tests/Commands/ImportVCardsTest.php
@@ -4,7 +4,6 @@ namespace Tests\Commands;
 
 use Mockery as m;
 use Tests\TestCase;
-use App\Models\User\User;
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Unit/Jobs/Reminder/NotifyUserAboutReminderTest.php b/tests/Unit/Jobs/Reminder/NotifyUserAboutReminderTest.php
index c99f82b78..18510d284 100644
--- a/tests/Unit/Jobs/Reminder/NotifyUserAboutReminderTest.php
+++ b/tests/Unit/Jobs/Reminder/NotifyUserAboutReminderTest.php
@@ -10,7 +10,6 @@ use App\Models\Contact\Contact;
 use App\Models\Contact\Reminder;
 use App\Notifications\UserNotified;
 use App\Notifications\UserReminded;
-use Illuminate\Support\Facades\Event;
 use App\Models\Contact\ReminderOutbox;
 use Illuminate\Support\Facades\Notification;
 use App\Jobs\Reminder\NotifyUserAboutReminder;
diff --git a/tests/Unit/Jobs/ScheduleStayInTouchTest.php b/tests/Unit/Jobs/ScheduleStayInTouchTest.php
index a82754a60..71d8c5bfa 100644
--- a/tests/Unit/Jobs/ScheduleStayInTouchTest.php
+++ b/tests/Unit/Jobs/ScheduleStayInTouchTest.php
@@ -7,7 +7,6 @@ use Tests\TestCase;
 use App\Models\User\User;
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
-use Illuminate\Support\Facades\Mail;
 use App\Notifications\StayInTouchEmail;
 use App\Jobs\StayInTouch\ScheduleStayInTouch;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Models/ContactTest.php b/tests/Unit/Models/ContactTest.php
index d1e6a69ea..e0d0fa81b 100644
--- a/tests/Unit/Models/ContactTest.php
+++ b/tests/Unit/Models/ContactTest.php
@@ -19,7 +19,6 @@ use App\Models\Contact\Occupation;
 use App\Models\Contact\ContactField;
 use App\Models\Contact\Conversation;
 use App\Models\Instance\SpecialDate;
-use Illuminate\Support\Facades\Mail;
 use App\Notifications\StayInTouchEmail;
 use App\Models\Contact\ContactFieldType;
 use App\Models\Relationship\Relationship;
diff --git a/tests/Unit/Services/Account/DestroyAllDocumentsTest.php b/tests/Unit/Services/Account/DestroyAllDocumentsTest.php
index 2273b93e7..d90e9fe1c 100644
--- a/tests/Unit/Services/Account/DestroyAllDocumentsTest.php
+++ b/tests/Unit/Services/Account/DestroyAllDocumentsTest.php
@@ -4,7 +4,6 @@ namespace Tests\Unit\Services\Account;
 
 use Tests\TestCase;
 use App\Models\Contact\Contact;
-use App\Models\Contact\Document;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use App\Services\Account\DestroyAllDocuments;
diff --git a/tests/Unit/Services/Account/Photo/UploadPhotoTest.php b/tests/Unit/Services/Account/Photo/UploadPhotoTest.php
index d6bc79773..2f764be49 100644
--- a/tests/Unit/Services/Account/Photo/UploadPhotoTest.php
+++ b/tests/Unit/Services/Account/Photo/UploadPhotoTest.php
@@ -5,7 +5,6 @@ namespace Tests\Unit\Services\Account\Photo;
 use Tests\TestCase;
 use App\Models\Account\Photo;
 use App\Models\Contact\Contact;
-use App\Models\Contact\Document;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use App\Services\Account\Photo\UploadPhoto;