diff --git a/app/Events/UserAccessedApi.php b/app/Events/UserAccessedApi.php
index ac614c7e0..26923542e 100644
--- a/app/Events/UserAccessedApi.php
+++ b/app/Events/UserAccessedApi.php
@@ -2,13 +2,9 @@
 
 namespace App\Events;
 
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class UserAccessedApi
 {
diff --git a/app/Events/UserLoggedIn.php b/app/Events/UserLoggedIn.php
index 9f9ca1d5d..b3ab786f1 100644
--- a/app/Events/UserLoggedIn.php
+++ b/app/Events/UserLoggedIn.php
@@ -2,13 +2,9 @@
 
 namespace App\Events;
 
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class UserLoggedIn
 {
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index 8ec8d720b..8d8504e85 100644
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Events\UserAccessedApi;
 use App\Models\User;
 use App\Models\Release;
 use Blacklight\http\API;
@@ -10,6 +9,7 @@ use Blacklight\Releases;
 use App\Models\ReleaseNfo;
 use App\Models\UserRequest;
 use Illuminate\Http\Request;
+use App\Events\UserAccessedApi;
 use Blacklight\utility\Utility;
 use App\Http\Controllers\BasePageController;
 
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 18065876b..afcde158f 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Events\UserLoggedIn;
 use App\Models\User;
 use App\Models\Settings;
 use Illuminate\Support\Arr;
+use App\Events\UserLoggedIn;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php
index 542693d7c..79e193f4a 100644
--- a/app/Http/Controllers/BasePageController.php
+++ b/app/Http/Controllers/BasePageController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 require_once NN_LIB.'utility/SmartyUtils.php';
 
-use App\Events\UserLoggedIn;
 use App\Models\User;
 use Blacklight\SABnzbd;
 use App\Models\Category;
@@ -12,6 +11,7 @@ use App\Models\Settings;
 use Blacklight\Contents;
 use App\Models\Forumpost;
 use Illuminate\Support\Arr;
+use App\Events\UserLoggedIn;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Pagination\LengthAwarePaginator;
 
diff --git a/app/Listeners/UpdateUserAccessedApi.php b/app/Listeners/UpdateUserAccessedApi.php
index c0ae44ee2..fd666dc5d 100644
--- a/app/Listeners/UpdateUserAccessedApi.php
+++ b/app/Listeners/UpdateUserAccessedApi.php
@@ -2,10 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Events\UserAccessedApi;
 use App\Models\User;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Events\UserAccessedApi;
 
 class UpdateUserAccessedApi
 {
diff --git a/app/Listeners/UpdateUserLoggedIn.php b/app/Listeners/UpdateUserLoggedIn.php
index 2dec0ac9f..f5415581c 100644
--- a/app/Listeners/UpdateUserLoggedIn.php
+++ b/app/Listeners/UpdateUserLoggedIn.php
@@ -2,10 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Events\UserLoggedIn;
 use App\Models\User;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Events\UserLoggedIn;
 
 class UpdateUserLoggedIn
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index bb9692e86..bf5225f6c 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,12 +2,12 @@
 
 namespace App\Providers;
 
-use App\Events\UserAccessedApi;
 use App\Events\UserLoggedIn;
-use App\Listeners\UpdateUserAccessedApi;
+use App\Events\UserAccessedApi;
 use App\Listeners\UpdateUserLoggedIn;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
+use App\Listeners\UpdateUserAccessedApi;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;