diff --git a/app/Events/AccountStatusChanged.php b/app/Events/AccountStatusChanged.php
index 8f8151e2..7f3dd78f 100644
--- a/app/Events/AccountStatusChanged.php
+++ b/app/Events/AccountStatusChanged.php
@@ -3,7 +3,6 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/app/Http/Controllers/LockUserAccountController.php b/app/Http/Controllers/LockUserAccountController.php
index 3ebd49e0..ecca1c8b 100644
--- a/app/Http/Controllers/LockUserAccountController.php
+++ b/app/Http/Controllers/LockUserAccountController.php
@@ -5,7 +5,6 @@
 use App\Http\Requests\LockUserAccountRequest;
 use App\Models\User;
 use App\Services\User\UserService;
-use Illuminate\Http\Request;
 
 class LockUserAccountController extends Controller
 {
diff --git a/app/Http/Livewire/ResultChecker.php b/app/Http/Livewire/ResultChecker.php
index 32aacbc8..c5d51986 100644
--- a/app/Http/Livewire/ResultChecker.php
+++ b/app/Http/Livewire/ResultChecker.php
@@ -3,7 +3,6 @@
 namespace App\Http\Livewire;
 
 use App\Models\AcademicYear;
-use App\Models\Semester;
 use App\Models\User;
 use App\Services\MyClass\MyClassService;
 use Livewire\Component;
diff --git a/app/Http/Middleware/EnsureAcademicYearIsSet.php b/app/Http/Middleware/EnsureAcademicYearIsSet.php
index f1afdfb2..620df0ed 100755
--- a/app/Http/Middleware/EnsureAcademicYearIsSet.php
+++ b/app/Http/Middleware/EnsureAcademicYearIsSet.php
@@ -10,7 +10,7 @@ class EnsureAcademicYearIsSet
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
      *
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/EnsureDefaultPasswordIsChanged.php b/app/Http/Middleware/EnsureDefaultPasswordIsChanged.php
index 43697c85..1f3adfc0 100755
--- a/app/Http/Middleware/EnsureDefaultPasswordIsChanged.php
+++ b/app/Http/Middleware/EnsureDefaultPasswordIsChanged.php
@@ -11,7 +11,7 @@ class EnsureDefaultPasswordIsChanged
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
      *
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/EnsureSemesterIsSet.php b/app/Http/Middleware/EnsureSemesterIsSet.php
index 546d9e59..c842ab3c 100755
--- a/app/Http/Middleware/EnsureSemesterIsSet.php
+++ b/app/Http/Middleware/EnsureSemesterIsSet.php
@@ -10,7 +10,7 @@ class EnsureSemesterIsSet
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
      *
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/EnsureSuperAdminHasSchoolId.php b/app/Http/Middleware/EnsureSuperAdminHasSchoolId.php
index 530158d0..d5b71606 100755
--- a/app/Http/Middleware/EnsureSuperAdminHasSchoolId.php
+++ b/app/Http/Middleware/EnsureSuperAdminHasSchoolId.php
@@ -10,7 +10,7 @@ class EnsureSuperAdminHasSchoolId
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
      *
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/PreventGraduatedStudent.php b/app/Http/Middleware/PreventGraduatedStudent.php
index 6c7db725..aa577341 100644
--- a/app/Http/Middleware/PreventGraduatedStudent.php
+++ b/app/Http/Middleware/PreventGraduatedStudent.php
@@ -10,7 +10,7 @@ class PreventGraduatedStudent
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
      *
      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/PreventLockAccountAccess.php b/app/Http/Middleware/PreventLockAccountAccess.php
index dcc29219..9273fa49 100644
--- a/app/Http/Middleware/PreventLockAccountAccess.php
+++ b/app/Http/Middleware/PreventLockAccountAccess.php
@@ -11,7 +11,7 @@ class PreventLockAccountAccess
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
      */
     public function handle(Request $request, Closure $next): Response
     {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 89b76f76..f308e9c8 100755
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
diff --git a/tests/Feature/AcademicYearTest.php b/tests/Feature/AcademicYearTest.php
index 5df77198..ca15ad22 100755
--- a/tests/Feature/AcademicYearTest.php
+++ b/tests/Feature/AcademicYearTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
 use App\Traits\FeatureTestTrait;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
diff --git a/tests/Feature/StudentTest.php b/tests/Feature/StudentTest.php
index f4b45d85..aade1054 100755
--- a/tests/Feature/StudentTest.php
+++ b/tests/Feature/StudentTest.php
@@ -4,7 +4,6 @@
 
 use App\Models\Promotion;
 use App\Models\StudentRecord;
-use App\Models\User;
 use App\Traits\FeatureTestTrait;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;