diff --git a/app/Extensions/Illuminate/Database/Eloquent/Builder.php b/app/Extensions/Illuminate/Database/Eloquent/Builder.php
deleted file mode 100644
index 2a093985e..000000000
--- a/app/Extensions/Illuminate/Database/Eloquent/Builder.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Extensions\Illuminate\Database\Eloquent;
-
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-
-class Builder extends EloquentBuilder
-{
-    /**
-     * Do nothing.
-     */
-    public function search(): self
-    {
-        return $this;
-    }
-}
diff --git a/app/Extensions/Illuminate/Events/Contracts/SubscribesToEvents.php b/app/Extensions/Illuminate/Events/Contracts/SubscribesToEvents.php
deleted file mode 100644
index e0810ddfb..000000000
--- a/app/Extensions/Illuminate/Events/Contracts/SubscribesToEvents.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Extensions\Illuminate\Events\Contracts;
-
-use Illuminate\Contracts\Events\Dispatcher;
-
-interface SubscribesToEvents
-{
-    public function subscribe(Dispatcher $events): void;
-}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6201d7723..e1984bc88 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use App\Facades\Activity;
-use Illuminate\Contracts\View\View;
+use Illuminate\View\View;
 
 class LoginController extends AbstractLoginController
 {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 5bb68375b..b4c338ee9 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -8,7 +8,6 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Contracts\Events\Dispatcher;
 use App\Exceptions\DisplayException;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
@@ -29,7 +28,6 @@ class ResetPasswordController extends Controller
      * ResetPasswordController constructor.
      */
     public function __construct(
-        private Dispatcher $dispatcher,
         private Hasher $hasher,
     ) {
     }
@@ -78,7 +76,7 @@ class ResetPasswordController extends Controller
         $user->setRememberToken(Str::random(60));
         $user->save();
 
-        $this->dispatcher->dispatch(new PasswordReset($user));
+        event(new PasswordReset($user));
 
         // If the user is not using 2FA log them in, otherwise skip this step and force a
         // fresh login where they'll be prompted to enter a token.
diff --git a/app/Http/Middleware/VerifyReCaptcha.php b/app/Http/Middleware/VerifyReCaptcha.php
index d3bc5a338..762a9646d 100644
--- a/app/Http/Middleware/VerifyReCaptcha.php
+++ b/app/Http/Middleware/VerifyReCaptcha.php
@@ -6,18 +6,10 @@ use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Events\Auth\FailedCaptcha;
-use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class VerifyReCaptcha
 {
-    /**
-     * VerifyReCaptcha constructor.
-     */
-    public function __construct(private Dispatcher $dispatcher)
-    {
-    }
-
     /**
      * Handle an incoming request.
      */
@@ -45,12 +37,7 @@ class VerifyReCaptcha
             }
         }
 
-        $this->dispatcher->dispatch(
-            new FailedCaptcha(
-                $request->ip(),
-                !empty($result) ? ($result->hostname ?? null) : null
-            )
-        );
+        event(new FailedCaptcha($request->ip(), $result->hostname ?? null));
 
         throw new HttpException(Response::HTTP_BAD_REQUEST, 'Failed to validate reCAPTCHA data.');
     }
diff --git a/app/Listeners/Auth/AuthenticationListener.php b/app/Listeners/Auth/AuthenticationListener.php
index de5271901..01a8e35c0 100644
--- a/app/Listeners/Auth/AuthenticationListener.php
+++ b/app/Listeners/Auth/AuthenticationListener.php
@@ -5,10 +5,9 @@ namespace App\Listeners\Auth;
 use App\Facades\Activity;
 use Illuminate\Auth\Events\Failed;
 use App\Events\Auth\DirectLogin;
-use Illuminate\Contracts\Events\Dispatcher;
-use App\Extensions\Illuminate\Events\Contracts\SubscribesToEvents;
+use Illuminate\Events\Dispatcher;
 
-class AuthenticationListener implements SubscribesToEvents
+class AuthenticationListener
 {
     /**
      * Handles an authentication event by logging the user and information about