diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
old mode 100644
new mode 100755
index 68afc940c3..73d79bc734
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,17 +1,11 @@
-<?php namespace FireflyIII\Providers;
+<?php
+
+namespace FireflyIII\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
-/**
- * Class AppServiceProvider
- *
- * @package FireflyIII\Providers
- *
- * @codeCoverageIgnore
- */
 class AppServiceProvider extends ServiceProvider
 {
-
     /**
      * Bootstrap any application services.
      *
@@ -25,19 +19,10 @@ class AppServiceProvider extends ServiceProvider
     /**
      * Register any application services.
      *
-     * This service provider is a great spot to register your various container
-     * bindings with the application. As you can see, we are registering our
-     * "Registrar" implementation here. You can add your own bindings too!
-     *
      * @return void
      */
     public function register()
     {
-        $this->app->bind(
-            'Illuminate\Contracts\Auth\Registrar',
-            'FireflyIII\Services\Registrar'
-        );
-
+        //
     }
-
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
new file mode 100755
index 0000000000..da063968ec
--- /dev/null
+++ b/app/Providers/AuthServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace FireflyIII\Providers;
+
+use Illuminate\Contracts\Auth\Access\Gate as GateContract;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+
+class AuthServiceProvider extends ServiceProvider
+{
+    /**
+     * The policy mappings for the application.
+     *
+     * @var array
+     */
+    protected $policies = [
+        'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
+    ];
+
+    /**
+     * Register any application authentication / authorization services.
+     *
+     * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
+     * @return void
+     */
+    public function boot(GateContract $gate)
+    {
+        $this->registerPolicies($gate);
+
+        //
+    }
+}
diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
deleted file mode 100644
index dc2e86ac21..0000000000
--- a/app/Providers/BusServiceProvider.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php namespace FireflyIII\Providers;
-
-use Illuminate\Bus\Dispatcher;
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Class BusServiceProvider
- *
- * @codeCoverageIgnore
- *
- * @package FireflyIII\Providers
- */
-class BusServiceProvider extends ServiceProvider
-{
-
-    /**
-     * Bootstrap any application services.
-     *
-     * @param  \Illuminate\Bus\Dispatcher $dispatcher
-     *
-     * @return void
-     */
-    public function boot(Dispatcher $dispatcher)
-    {
-        $dispatcher->mapUsing(
-            function ($command) {
-                return Dispatcher::simpleMapping(
-                    $command, 'FireflyIII\Commands', 'FireflyIII\Handlers\Commands'
-                );
-            }
-        );
-    }
-
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
-
-}
diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
deleted file mode 100644
index 7ee3b11047..0000000000
--- a/app/Providers/ConfigServiceProvider.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php namespace FireflyIII\Providers;
-
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Class ConfigServiceProvider
- *
- * @package FireflyIII\Providers
- * @codeCoverageIgnore
- *
- */
-class ConfigServiceProvider extends ServiceProvider
-{
-
-    /**
-     * Overwrite any vendor / package configuration.
-     *
-     * This service provider is intended to provide a convenient location for you
-     * to overwrite any "vendor" or package configuration that you may want to
-     * modify before the application handles the incoming request / command.
-     *
-     *
-     * @return void
-     */
-    public function register()
-    {
-
-    }
-
-}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
old mode 100644
new mode 100755
index 299b571d63..6bea8ab171
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,28 +1,23 @@
-<?php namespace FireflyIII\Providers;
+<?php
+
+namespace FireflyIII\Providers;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Support\Facades\Navigation;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use Log;
+use Navigation;
 
-/**
- * Class EventServiceProvider
- *
- * @package FireflyIII\Providers
- */
 class EventServiceProvider extends ServiceProvider
 {
-
     /**
-     * The event handler mappings for the application.
+     * The event listener mappings for the application.
      *
      * @var array
      */
@@ -38,6 +33,7 @@ class EventServiceProvider extends ServiceProvider
             ]
         ];
 
+
     /**
      * Register any other events for your application.
      *
@@ -82,6 +78,7 @@ class EventServiceProvider extends ServiceProvider
         );
 
 
+        //
     }
 
     /**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
old mode 100644
new mode 100755
index f946ad464e..d9a1761eae
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,17 +1,12 @@
-<?php namespace FireflyIII\Providers;
+<?php
+
+namespace FireflyIII\Providers;
 
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Routing\Router;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
-/**
- * Class RouteServiceProvider
- *
- * @package FireflyIII\Providers
- * @codeCoverageIgnore
- */
 class RouteServiceProvider extends ServiceProvider
 {
-
     /**
      * This namespace is applied to the controller routes in your routes file.
      *
@@ -24,33 +19,26 @@ class RouteServiceProvider extends ServiceProvider
     /**
      * Define your route model bindings, pattern filters, etc.
      *
-     * @param  \Illuminate\Routing\Router $router
-     *
+     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
     public function boot(Router $router)
     {
-        parent::boot($router);
+        //
 
+        parent::boot($router);
     }
 
     /**
      * Define the routes for the application.
      *
-     * @param  \Illuminate\Routing\Router $router
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
+     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
     public function map(Router $router)
     {
-        $router->group(
-            ['namespace' => $this->namespace], function ($router) {
-            /** @noinspection PhpIncludeInspection */
+        $router->group(['namespace' => $this->namespace], function ($router) {
             require app_path('Http/routes.php');
-        }
-        );
+        });
     }
-
 }
diff --git a/app/Providers/TestingServiceProvider.php b/app/Providers/TestingServiceProvider.php
deleted file mode 100644
index a548521e04..0000000000
--- a/app/Providers/TestingServiceProvider.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace FireflyIII\Providers;
-
-
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Class TestingServiceProvider
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Providers
- */
-class TestingServiceProvider extends ServiceProvider
-{
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        if ($this->app->environment() == 'testing') {
-            $this->app['config']['session.driver'] = 'native';
-        }
-    }
-
-}
diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
deleted file mode 100644
index 5f69c7ba24..0000000000
--- a/app/Services/Registrar.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php namespace FireflyIII\Services;
-
-use FireflyIII\User;
-use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
-use Validator;
-
-/**
- * Class Registrar
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Services
- */
-class Registrar implements RegistrarContract
-{
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param  array $data
-     *
-     * @return User
-     */
-    public function create(array $data)
-    {
-        return User::create(
-            [
-                'email'    => $data['email'],
-                'password' => $data['password'],
-            ]
-        );
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array $data
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    public function validator(array $data)
-    {
-        return Validator::make(
-            $data, [
-                     'email'    => 'required|email|max:255|unique:users',
-                     'password' => 'required|confirmed|min:6',
-                 ]
-        );
-    }
-
-}