diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 14fef6c27..b9b656dc1 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,20 +1,20 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Providers;
 
 use View;
 use Cache;
-use Pterodactyl\Models;
-use Pterodactyl\Observers;
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Models\Subuser;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
+use Pterodactyl\Observers\UserObserver;
+use Pterodactyl\Observers\ServerObserver;
+use Pterodactyl\Observers\SubuserObserver;
+use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
+use DaneEveritt\LoginNotifications\NotificationServiceProvider;
+use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -25,9 +25,9 @@ class AppServiceProvider extends ServiceProvider
     {
         Schema::defaultStringLength(191);
 
-        Models\User::observe(Observers\UserObserver::class);
-        Models\Server::observe(Observers\ServerObserver::class);
-        Models\Subuser::observe(Observers\SubuserObserver::class);
+        User::observe(UserObserver::class);
+        Server::observe(ServerObserver::class);
+        Subuser::observe(SubuserObserver::class);
 
         View::share('appVersion', $this->versionData()['version'] ?? 'undefined');
         View::share('appIsGit', $this->versionData()['is_git'] ?? false);
@@ -39,11 +39,12 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         if ($this->app->environment() !== 'production') {
-            $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+            $this->app->register(DebugbarServiceProvider::class);
+            $this->app->register(IdeHelperServiceProvider::class);
         }
 
         if (config('pterodactyl.auth.notifications')) {
-            $this->app->register(\DaneEveritt\LoginNotifications\NotificationServiceProvider::class);
+            $this->app->register(NotificationServiceProvider::class);
         }
     }
 
diff --git a/config/app.php b/config/app.php
index 7eb416d37..c193e42e8 100644
--- a/config/app.php
+++ b/config/app.php
@@ -171,7 +171,6 @@ return [
         /*
          * Additional Dependencies
          */
-        Barryvdh\Debugbar\ServiceProvider::class,
         PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
         igaster\laravelTheme\themeServiceProvider::class,
         Prologue\Alerts\AlertsServiceProvider::class,
@@ -209,7 +208,6 @@ return [
         'Cron' => Cron\CronExpression::class,
         'Crypt' => Illuminate\Support\Facades\Crypt::class,
         'DB' => Illuminate\Support\Facades\DB::class,
-        'Debugbar' => Barryvdh\Debugbar\Facade::class,
         'Eloquent' => Illuminate\Database\Eloquent\Model::class,
         'Event' => Illuminate\Support\Facades\Event::class,
         'File' => Illuminate\Support\Facades\File::class,