diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 973d4d8d7..37f5c2f42 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,8 +2,11 @@
 
 namespace App\Providers;
 
+use App\Listeners\AuthLogin;
+use App\Listeners\LogFailedLogin;
 use App\Models\AccountInterstitial;
 use App\Models\Avatar;
+use App\Models\CustomFilter;
 use App\Models\DirectMessage;
 use App\Models\Follower;
 use App\Models\HashtagFollow;
@@ -31,14 +34,18 @@ use App\Observers\StatusHashtagObserver;
 use App\Observers\StatusObserver;
 use App\Observers\UserFilterObserver;
 use App\Observers\UserObserver;
+use App\Policies\CustomFilterPolicy;
 use App\Services\AccountService;
 use App\Services\UserOidcService;
+use Illuminate\Auth\Events\Failed;
+use Illuminate\Auth\Events\Login;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\URL;
@@ -98,6 +105,11 @@ class AppServiceProvider extends ServiceProvider
         });
         Validator::includeUnvalidatedArrayKeys();
 
+        Gate::policy(CustomFilter::class, CustomFilterPolicy::class);
+
+        Event::listen(Login::class, AuthLogin::class);
+        Event::listen(Failed::class, LogFailedLogin::class);
+
         Gate::define('viewPulse', function (User $user) {
             return $user->is_admin === 1;
         });
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
deleted file mode 100644
index f022a2bc7..000000000
--- a/app/Providers/AuthServiceProvider.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Models\CustomFilter;
-use App\Policies\CustomFilterPolicy;
-use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
-
-class AuthServiceProvider extends ServiceProvider
-{
-    /**
-     * The policy mappings for the application.
-     *
-     * @var array
-     */
-    protected $policies = [
-        CustomFilter::class => CustomFilterPolicy::class,
-    ];
-
-    /**
-     * Register any authentication / authorization services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        // Gate::define('viewWebSocketsDashboard', function ($user = null) {
-        //     return $user->is_admin;
-        // });
-    }
-}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
deleted file mode 100644
index 845a21eb6..000000000
--- a/app/Providers/EventServiceProvider.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Listeners\AuthLogin;
-use App\Listeners\LogFailedLogin;
-use Illuminate\Auth\Events\Failed;
-use Illuminate\Auth\Events\Login;
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        Login::class => [
-            AuthLogin::class,
-        ],
-        Failed::class => [
-            LogFailedLogin::class,
-        ],
-    ];
-
-    /**
-     * Register any events for your application.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
-    }
-}
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index a1422ea4c..55339d1c6 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -1,15 +1,11 @@
 <?php
 
 use App\Providers\AppServiceProvider;
-use App\Providers\AuthServiceProvider;
-use App\Providers\EventServiceProvider;
 use App\Providers\HorizonServiceProvider;
 use App\Providers\PassportServiceProvider;
 
 return [
     AppServiceProvider::class,
-    AuthServiceProvider::class,
     HorizonServiceProvider::class,
-    EventServiceProvider::class,
     PassportServiceProvider::class,
 ];