diff --git a/.gitignore b/.gitignore
index c310b79d57..92b208b055 100755
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,5 @@ tests/_support/_generated/*
 
 phpmd\.xml
 /public/storage
+_ide_helper.php
+.phpstorm.meta.php
diff --git a/app/Console/Commands/DisableLDAP.php b/app/Console/Commands/DisableLDAP.php
index 5522df37cc..fd2f0a1070 100644
--- a/app/Console/Commands/DisableLDAP.php
+++ b/app/Console/Commands/DisableLDAP.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Models\Setting;
+use Illuminate\Console\Command;
 
 class DisableLDAP extends Command
 {
diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index c8a0fecd65..effab2250b 100755
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace App\Console\Commands;
 
-use App\Services\LdapAd;
-use Illuminate\Support\Facades\Log;
-use Exception;
-use App\Models\Location;
-use Illuminate\Console\Command;
 use Adldap\Models\User as AdldapUser;
+use App\Models\Location;
+use App\Services\LdapAd;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 /**
  * LDAP / AD sync command.
diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index 9f09ea7184..83d88ffb27 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -1,31 +1,9 @@
 <?php
 namespace App\Console\Commands;
 
-use App\Helpers\Helper;
-use App\Importer\AccessoryImporter;
-use App\Importer\AssetImporter;
-use App\Importer\ConsumableImporter;
-use App\Importer\Importer;
-use App\Models\Accessory;
-use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Company;
-use App\Models\Consumable;
-use App\Models\CustomField;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Setting;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
-use App\Models\User;
-use DB;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Model;
-use League\Csv\Reader;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
-use ForceUTF8\Encoding;
 
 ini_set('max_execution_time', 600); //600 seconds = 10 minutes
 ini_set('memory_limit', '500M');
diff --git a/app/Console/Commands/Purge.php b/app/Console/Commands/Purge.php
index d5f7cab503..0c4829c94c 100644
--- a/app/Console/Commands/Purge.php
+++ b/app/Console/Commands/Purge.php
@@ -2,22 +2,19 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
 use Illuminate\Console\Command;
-use DB;
-use \App\Models\Asset;
-use \App\Models\AssetModel;
-use \App\Models\Location;
-use \App\Models\Company;
-use \App\Models\License;
-use \App\Models\Accessory;
-use \App\Models\Component;
-use \App\Models\Consumable;
-use \App\Models\Category;
-use \App\Models\User;
-use \App\Models\Supplier;
-use \App\Models\Manufacturer;
-use \App\Models\Depreciation;
-use \App\Models\Statuslabel;
 
 class Purge extends Command
 {
diff --git a/app/Console/Commands/RecryptFromMcrypt.php b/app/Console/Commands/RecryptFromMcrypt.php
index a45a1c9bc4..6c3a962823 100644
--- a/app/Console/Commands/RecryptFromMcrypt.php
+++ b/app/Console/Commands/RecryptFromMcrypt.php
@@ -2,11 +2,11 @@
 
 namespace App\Console\Commands;
 
-use App\Models\CustomField;
-use Illuminate\Console\Command;
 use App\LegacyEncrypter\McryptEncrypter;
-use App\Models\Setting;
 use App\Models\Asset;
+use App\Models\CustomField;
+use App\Models\Setting;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 
 class RecryptFromMcrypt extends Command
diff --git a/app/Console/Commands/RegenerateAssetTags.php b/app/Console/Commands/RegenerateAssetTags.php
index 9e436df6dd..2646ebeb35 100644
--- a/app/Console/Commands/RegenerateAssetTags.php
+++ b/app/Console/Commands/RegenerateAssetTags.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Models\Asset;
 use App\Models\Setting;
-use DB;
 use Artisan;
+use Illuminate\Console\Command;
 
 class RegenerateAssetTags extends Command
 {
diff --git a/app/Console/Commands/ResetDemoSettings.php b/app/Console/Commands/ResetDemoSettings.php
index 47117f477c..c1bb19bf80 100644
--- a/app/Console/Commands/ResetDemoSettings.php
+++ b/app/Console/Commands/ResetDemoSettings.php
@@ -3,9 +3,9 @@
 namespace App\Console\Commands;
 
 
-use Illuminate\Console\Command;
 use App\Models\Setting;
 use App\Models\User;
+use Illuminate\Console\Command;
 
 class ResetDemoSettings extends Command
 {
diff --git a/app/Console/Commands/RestoreDeletedUsers.php b/app/Console/Commands/RestoreDeletedUsers.php
index a9c8a43925..c17c18984a 100644
--- a/app/Console/Commands/RestoreDeletedUsers.php
+++ b/app/Console/Commands/RestoreDeletedUsers.php
@@ -2,16 +2,13 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use App\Models\User;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use App\Models\Consumable;
-use App\Models\Accessory;
-use App\Models\LicenseSeat;
 use App\Models\License;
-use DB;
+use App\Models\User;
 use Artisan;
+use DB;
+use Illuminate\Console\Command;
 
 class RestoreDeletedUsers extends Command
 {
diff --git a/app/Console/Commands/SendCurrentInventoryToUsers.php b/app/Console/Commands/SendCurrentInventoryToUsers.php
index be267e73e4..9f1fe0f761 100644
--- a/app/Console/Commands/SendCurrentInventoryToUsers.php
+++ b/app/Console/Commands/SendCurrentInventoryToUsers.php
@@ -2,10 +2,9 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use App\Models\Asset;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
+use Illuminate\Console\Command;
 
 class SendCurrentInventoryToUsers extends Command
 {
diff --git a/app/Console/Commands/SyncAssetCounters.php b/app/Console/Commands/SyncAssetCounters.php
index 33fee840d6..33104818e1 100644
--- a/app/Console/Commands/SyncAssetCounters.php
+++ b/app/Console/Commands/SyncAssetCounters.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Models\Asset;
+use Illuminate\Console\Command;
 
 class SyncAssetCounters extends Command
 {
diff --git a/app/Console/Commands/SyncAssetLocations.php b/app/Console/Commands/SyncAssetLocations.php
index 25e27c7420..e5fb76bbd7 100644
--- a/app/Console/Commands/SyncAssetLocations.php
+++ b/app/Console/Commands/SyncAssetLocations.php
@@ -2,10 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Models\CustomField;
-use Illuminate\Console\Command;
 use App\Models\Asset;
-use Illuminate\Support\Facades\Storage;
+use Illuminate\Console\Command;
 
 class SyncAssetLocations extends Command
 {
diff --git a/app/Events/CheckoutAccepted.php b/app/Events/CheckoutAccepted.php
index 0b26e69475..5146b32ee9 100644
--- a/app/Events/CheckoutAccepted.php
+++ b/app/Events/CheckoutAccepted.php
@@ -2,12 +2,8 @@
 
 namespace App\Events;
 
-use App\Models\Accessory;
-use App\Models\Actionlog;
 use App\Models\CheckoutAcceptance;
 use App\Models\Contracts\Acceptable;
-use App\Models\User;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Events/CheckoutDeclined.php b/app/Events/CheckoutDeclined.php
index 2aae6dd914..44f399423f 100644
--- a/app/Events/CheckoutDeclined.php
+++ b/app/Events/CheckoutDeclined.php
@@ -2,12 +2,8 @@
 
 namespace App\Events;
 
-use App\Models\Accessory;
-use App\Models\Actionlog;
 use App\Models\CheckoutAcceptance;
 use App\Models\Contracts\Acceptable;
-use App\Models\User;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Exceptions/CheckoutNotAllowed.php b/app/Exceptions/CheckoutNotAllowed.php
index 91bf2b865b..6fe2c1d484 100644
--- a/app/Exceptions/CheckoutNotAllowed.php
+++ b/app/Exceptions/CheckoutNotAllowed.php
@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use Exception;
+
 class CheckoutNotAllowed extends Exception
 {
 
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index b232b8956d..8d9e71bb28 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,11 +2,10 @@
 
 namespace App\Exceptions;
 
+use App\Helpers\Helper;
 use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use App\Helpers\Helper;
-use Illuminate\Validation\ValidationException;
 use Log;
 
 class Handler extends ExceptionHandler
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 5b4ca1fde0..2418fba553 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1,24 +1,14 @@
 <?php
 namespace App\Helpers;
 
-use DB;
-use App\Models\Statuslabel;
-use App\Models\Location;
-use App\Models\Department;
-use App\Models\AssetModel;
-use App\Models\Company;
-use App\Models\User;
-use App\Models\Manufacturer;
-use App\Models\Supplier;
-use App\Models\Category;
-use App\Models\Depreciation;
-use App\Models\CustomFieldset;
-use App\Models\CustomField;
-use App\Models\Component;
 use App\Models\Accessory;
+use App\Models\Component;
 use App\Models\Consumable;
-use App\Models\Asset;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\Depreciation;
 use App\Models\Setting;
+use App\Models\Statuslabel;
 use Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index 0570297064..19b204b153 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -7,9 +7,8 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Accessory;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-use Redirect;
 use Illuminate\Support\Facades\Storage;
+use Redirect;
 
 /** This controller handles all actions related to Accessories for
  * the Snipe-IT Asset Management application.
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
index 930e9b6619..f52ba10547 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -9,7 +9,6 @@ use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
 
 class AccessoryCheckinController extends Controller
 {
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index 23cd29d2d0..2f829b4e82 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -6,16 +6,13 @@ use App\Events\CheckoutDeclined;
 use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Http\Controllers\Controller;
-use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
-use App\Models\Consumable;
 use App\Models\Contracts\Acceptable;
-use App\Models\License;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class AcceptanceController extends Controller {
 	
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 08a39749f5..84fd58c544 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -2,14 +2,13 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Accessory;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\AccessoriesTransformer;
-use App\Models\Company;
 use App\Http\Transformers\SelectlistTransformer;
-
+use App\Models\Accessory;
+use App\Models\Company;
+use Illuminate\Http\Request;
 
 class AccessoriesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php
index 626ba898b2..dbbf3faebc 100644
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -9,7 +9,6 @@ use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Auth;
 use Carbon\Carbon;
-use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
 
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 2da6508ebe..2a739b1681 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -1,17 +1,16 @@
 <?php
 namespace App\Http\Controllers\Api;
 
-use App\Models\AssetModel;
-use App\Models\Asset;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\AssetModelsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-
 /**
  * This class controls all actions related to asset models for
  * the Snipe-IT Asset Management application.
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 40045af848..6fa40f90fc 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\LicensesTransformer;
+use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Company;
@@ -14,26 +15,16 @@ use App\Models\License;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use Artisan;
 use Auth;
 use Carbon\Carbon;
-use Config;
 use DB;
-use Gate;
 use Illuminate\Http\Request;
 use Input;
-use Lang;
-use Log;
-use Mail;
 use Paginator;
-use Response;
 use Slack;
 use Str;
 use TCPDF;
 use Validator;
-use View;
-use App\Http\Transformers\SelectlistTransformer;
-
 
 /**
  * This class controls all actions related to assets for
@@ -476,10 +467,9 @@ class AssetsController extends Controller
     {
         $this->authorize('update', Asset::class);
 
-        $asset->fill($request->all());
-
-
         if ($asset = Asset::find($id)) {
+            $asset->fill($request->all());
+
             ($request->filled('model_id')) ?
                 $asset->model()->associate(AssetModel::find($request->get('model_id'))) : null;
             ($request->filled('rtd_location_id')) ?
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index a51376ac29..1b1304062b 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Category;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\CategoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Category;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
 class CategoriesController extends Controller
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 56be71aaef..17f26aae61 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Http\Transformers\CompaniesTransformer;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Company;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\CompaniesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Company;
+use Illuminate\Http\Request;
 
 class CompaniesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index e077a6ea48..6d2788c084 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -2,14 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\ComponentsTransformer;
-use App\Http\Transformers\ComponentsAssetsTransformer;
-use App\Models\Component;
-use App\Models\Company;
 use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\ComponentsTransformer;
+use App\Models\Company;
+use App\Models\Component;
+use Illuminate\Http\Request;
 
 class ComponentsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index f5dc8c8dee..46f36c58ba 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Transformers\ConsumablesTransformer;
+use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
 use App\Models\Consumable;
-use App\Http\Transformers\ConsumablesTransformer;
-use App\Helpers\Helper;
-use App\Http\Transformers\SelectlistTransformer;
+use Illuminate\Http\Request;
 
 class ConsumablesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.php
index cd93a46383..c425347c58 100644
--- a/app/Http/Controllers/Api/CustomFieldsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsController.php
@@ -9,7 +9,6 @@ use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
 use Validator;
-use Illuminate\Validation\Rule;
 
 class CustomFieldsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php
index 5ed9161522..08533229ee 100644
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -1,21 +1,14 @@
 <?php
 namespace App\Http\Controllers\Api;
 
-use View;
-use App\Models\CustomFieldset;
-use App\Models\CustomField;
-use Input;
-use Validator;
-use Redirect;
-use App\Models\AssetModel;
-use Lang;
-use Auth;
-use Illuminate\Http\Request;
-use Log;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Http\Transformers\CustomFieldsTransformer;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\CustomFieldsetsTransformer;
+use App\Http\Transformers\CustomFieldsTransformer;
+use App\Models\CustomFieldset;
+use Illuminate\Http\Request;
+use Redirect;
+use View;
 
 /**
  * This controller handles all actions related to Custom Asset Fieldsets for
diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php
index d4f24e58bb..f93af8f7c2 100644
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Department;
-use App\Http\Transformers\DepartmentsTransformer;
 use App\Helpers\Helper;
-use Auth;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\DepartmentsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Department;
+use Auth;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
 class DepartmentsController extends Controller
diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php
index 4a0ca180ef..f335f590c0 100644
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Depreciation;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\DepreciationsTransformer;
+use App\Models\Depreciation;
+use Illuminate\Http\Request;
 
 class DepreciationsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index e1296fc7c3..e8f98f73a4 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Group;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\GroupsTransformer;
+use App\Models\Group;
+use Illuminate\Http\Request;
 
 class GroupsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php
index 797df4d9ef..7504daf633 100644
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -6,16 +6,15 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ItemImportRequest;
 use App\Http\Transformers\ImportsTransformer;
+use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
-use Illuminate\Http\Request;
+use Artisan;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
-use Artisan;
-use App\Models\Asset;
-use Illuminate\Support\Facades\Storage;
 
 class ImportController extends Controller
 {
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 089f9ce85a..30a0f5931f 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -6,12 +6,12 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Http\Transformers\LicensesTransformer;
+use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use App\Http\Transformers\SelectlistTransformer;
 
 class LicensesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index 3158e22c60..10cca5dc8d 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Location;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Location;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
 class LocationsController extends Controller
diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php
index d1b144d97a..a1cf9027ba 100644
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -2,13 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Manufacturer;
-use App\Http\Transformers\DatatablesTransformer;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\ManufacturersTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Manufacturer;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
 class ManufacturersController extends Controller
diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.php
index 97e179ecb3..6d6f2797f1 100644
--- a/app/Http/Controllers/Api/PredefinedKitsController.php
+++ b/app/Http/Controllers/Api/PredefinedKitsController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\PredefinedKit;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\PredefinedKitsTransformer;
+use App\Models\PredefinedKit;
+use Illuminate\Http\Request;
 
 /**
  *  @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index 0798381884..f6c31d5db1 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -2,11 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\CheckoutRequest;
-use App\Http\Controllers\Controller;
-use Auth;
 use App\Helpers\Helper;
-
+use App\Http\Controllers\Controller;
+use App\Models\CheckoutRequest;
+use Auth;
 
 class ProfileController extends Controller
 {
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index e1b6ddd813..b29c327345 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\Actionlog;
 use App\Http\Transformers\ActionlogsTransformer;
+use App\Models\Actionlog;
+use Illuminate\Http\Request;
 
 class ReportsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index b08cb06412..e008c3a877 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -2,17 +2,17 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Services\LdapAd;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Notification;
-use App\Models\Setting;
-use Illuminate\Http\Request;
-use App\Notifications\MailTest;
-use App\Notifications\SlackTest;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LoginAttemptsTransformer;
+use App\Models\Setting;
+use App\Notifications\MailTest;
+use App\Notifications\SlackTest;
+use App\Services\LdapAd;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Notification;
 
 class SettingsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 7304f7dcf3..4cd83a385b 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Statuslabel;
-use App\Models\Asset;
-use App\Http\Transformers\StatuslabelsTransformer;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\StatuslabelsTransformer;
+use App\Models\Asset;
+use App\Models\Statuslabel;
+use Illuminate\Http\Request;
 
 class StatuslabelsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index d537f2d526..17b2b36beb 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -2,15 +2,14 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
-use App\Models\Supplier;
-use App\Http\Transformers\SuppliersTransformer;
+use App\Http\Controllers\Controller;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Http\Transformers\SuppliersTransformer;
+use App\Models\Supplier;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-
 class SuppliersController extends Controller
 {
     /**
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index c26d676949..ec1ae80ed9 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -2,19 +2,19 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Http\Transformers\LicensesTransformer;
-use App\Models\License;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\UsersTransformer;
-use App\Models\Company;
-use App\Models\User;
 use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
-use App\Models\Asset;
-use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\LicensesTransformer;
+use App\Http\Transformers\SelectlistTransformer;
+use App\Http\Transformers\UsersTransformer;
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\License;
+use App\Models\User;
+use Illuminate\Http\Request;
 
 class UsersController extends Controller
 {
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index 6e0100065a..b3f8482f1b 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -1,26 +1,17 @@
 <?php
 namespace App\Http\Controllers;
 
+use App\Helpers\Helper;
+use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use Carbon\Carbon;
 use App\Models\Company;
-use DB;
-use Input;
-use Lang;
-use Log;
-use Mail;
-use Response;
+use Auth;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Slack;
 use Str;
 use TCPDF;
-use Validator;
 use View;
-use App\Models\Setting;
-use App\Models\Asset;
-use App\Helpers\Helper;
-use Auth;
-use Gate;
-use Illuminate\Http\Request;
 
 /**
  * This controller handles all actions related to Asset Maintenance for
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 790b8c9876..0375fe456f 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -1,14 +1,13 @@
 <?php
 namespace App\Http\Controllers;
 
+use App\Helpers\Helper;
+use App\Http\Requests\ImageUploadRequest;
+use App\Models\AssetModel;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
-use App\Models\AssetModel;
 use Redirect;
-use App\Helpers\Helper;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 
 /**
  * This class controls all actions related to asset models for
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index 746376df4b..f9fc0032e6 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -8,10 +8,7 @@ use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Models\Asset;
-use App\Models\Location;
-use App\Models\User;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class AssetCheckoutController extends Controller
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index bb9cfe7cff..520156bd4a 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -7,35 +7,28 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
+use App\Models\CheckoutRequest;
 use App\Models\Company;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use Artisan;
 use Auth;
 use Carbon\Carbon;
-use Config;
 use DB;
 use Gate;
 use Illuminate\Http\Request;
-use Image;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Input;
-use Lang;
 use League\Csv\Reader;
 use League\Csv\Statement;
-use Illuminate\Support\Facades\Cache;
-use Log;
-use Mail;
 use Paginator;
 use Redirect;
 use Response;
 use Slack;
 use Str;
 use TCPDF;
-use Validator;
 use View;
-use App\Models\CheckoutRequest;
-use Illuminate\Support\Facades\Storage;
 
 /**
  * This class controls all actions related to assets for
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 9fd91b0366..993afdea7e 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -7,7 +7,6 @@ use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Setting;
-use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index ef085c6e7e..ef0760e276 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
-use App\Models\User;
 
 class ForgotPasswordController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 23b2fca093..5f3bd91bae 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,19 +2,19 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Services\LdapAd;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ThrottlesLogins;
 use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
+use App\Services\LdapAd;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
-use Redirect;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Validator;
+use Redirect;
 
 /**
  * This controller handles authentication for the user, including local
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 146974df96..901af3e2d0 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class RegisterController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index fe1eb6d1e0..540abc1f30 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
 
-
 class ResetPasswordController extends Controller
 {
     /*
diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php
index bc643841e9..c8ac2b7540 100755
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -2,22 +2,11 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
-use App\Models\Category as Category;
-use App\Models\Company;
-use App\Models\CustomField;
-use App\Models\Setting;
-use Auth;
-use DB;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
-use Input;
-use Lang;
-use Redirect;
-use Str;
-use View;
-use Image;
 use App\Http\Requests\ImageUploadRequest;
+use App\Models\Category as Category;
+use Auth;
 use Illuminate\Support\Facades\Storage;
+use Str;
 
 /**
  * This class controls all actions related to Categories for
diff --git a/app/Http/Controllers/CheckInOutRequest.php b/app/Http/Controllers/CheckInOutRequest.php
index 484b6e49db..f080dac4e3 100644
--- a/app/Http/Controllers/CheckInOutRequest.php
+++ b/app/Http/Controllers/CheckInOutRequest.php
@@ -1,7 +1,6 @@
 <?php
 namespace App\Http\Controllers;
 
-use App\Exceptions\CheckoutNotAllowed;
 use App\Models\Asset;
 use App\Models\Location;
 use App\Models\SnipeModel;
diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php
index fa6df0b1f6..fe358e3280 100644
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -1,10 +1,9 @@
 <?php
 namespace App\Http\Controllers;
 
+use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use Illuminate\Http\Request;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
 
 /**
diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.php
index dfba1dcf84..b42cdca9eb 100644
--- a/app/Http/Controllers/Components/ComponentCheckinController.php
+++ b/app/Http/Controllers/Components/ComponentCheckinController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Components;
 use App\Events\CheckoutableCheckedIn;
 use App\Events\ComponentCheckedIn;
 use App\Http\Controllers\Controller;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Component;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index 9bb9318ca4..d7f0bce96a 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Consumable;
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 496e8f50fb..14f56d0d05 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -22,10 +22,10 @@
 namespace App\Http\Controllers;
 
 use Auth;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 0e0b95b090..e58e00c193 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -1,14 +1,12 @@
 <?php
 namespace App\Http\Controllers;
 
-use Redirect;
 use App\Helpers\Helper;
+use App\Http\Requests\CustomFieldRequest;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
-use App\Http\Requests\CustomFieldRequest;
-
+use Redirect;
 
 /**
  * This controller handles all actions related to Custom Asset Fields for
diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index fae646e9d1..785b221db5 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -1,14 +1,14 @@
 <?php
 namespace App\Http\Controllers;
 
-use App\Models\CustomFieldset;
+use App\Models\AssetModel;
 use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
 use Redirect;
-use App\Models\AssetModel;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
 
 /**
  * This controller handles all actions related to Custom Asset Fields for
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 0fbdcf6c89..e6ad988c45 100755
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -2,12 +2,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Controllers\AdminController;
-use App\Models\Actionlog;
-use View;
 use Auth;
-use Redirect;
-use App\Models\Asset;
-use App\Models\Company;
+use View;
 
 /**
  * This controller handles all actions related to the Admin Dashboard
diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php
index 4afcd2a5a9..9c0cd8d4bb 100644
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -2,11 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use App\Models\Department;
-use Illuminate\Support\Facades\Auth;
-use Image;
 use App\Http\Requests\ImageUploadRequest;
+use App\Models\Department;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 
 class DepartmentsController extends Controller
diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php
index c2b205ecb2..d7177829ea 100755
--- a/app/Http/Controllers/DepreciationsController.php
+++ b/app/Http/Controllers/DepreciationsController.php
@@ -2,8 +2,8 @@
 namespace App\Http\Controllers;
 
 use App\Models\Depreciation;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * This controller handles all actions related to Depreciations for
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index abeb8c2a8e..89ce96d0c4 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -1,9 +1,9 @@
 <?php
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Input;
-use App\Models\Group;
 use App\Helpers\Helper;
+use App\Models\Group;
+use Illuminate\Support\Facades\Input;
 
 /**
  * This controller handles all actions related to User Groups for
diff --git a/app/Http/Controllers/ImportsController.php b/app/Http/Controllers/ImportsController.php
index 30f397ca08..7c4c8430f3 100644
--- a/app/Http/Controllers/ImportsController.php
+++ b/app/Http/Controllers/ImportsController.php
@@ -3,9 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Transformers\ImportsTransformer;
-use App\Models\Import;
 use App\Models\Asset;
-
+use App\Models\Import;
 
 class ImportsController extends Controller
 {
diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php
index 0007372a46..e7f35b69b1 100644
--- a/app/Http/Controllers/Kits/CheckoutKitController.php
+++ b/app/Http/Controllers/Kits/CheckoutKitController.php
@@ -1,22 +1,14 @@
 <?php
 namespace App\Http\Controllers\Kits;
 
-use App\Models\PredefinedKit;
-use App\Models\AssetModel;
-use App\Models\PredefinedModel;
-use App\Models\License;
-use App\Models\PredefinedLicence;
-use Illuminate\Support\Facades\DB;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\ImageUploadRequest;
-use App\Models\Accessory;
-use Illuminate\Http\Request;
 use App\Http\Controllers\CheckInOutRequest;
-use App\Services\PredefinedKitCheckoutService;
+use App\Http\Controllers\Controller;
+use App\Models\PredefinedKit;
+use App\Models\PredefinedLicence;
+use App\Models\PredefinedModel;
 use App\Models\User;
-
-
-
+use App\Services\PredefinedKitCheckoutService;
+use Illuminate\Http\Request;
 
 /**
  * This controller handles all access kits management:
diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.php
index 2ae5ca0111..79c76f887d 100644
--- a/app/Http/Controllers/Kits/PredefinedKitsController.php
+++ b/app/Http/Controllers/Kits/PredefinedKitsController.php
@@ -1,18 +1,13 @@
 <?php
 namespace App\Http\Controllers\Kits;
 
-use App\Models\PredefinedKit;
-use App\Models\AssetModel;
-use App\Models\PredefinedModel;
-use App\Models\License;
-use App\Models\PredefinedLicence;
-use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Accessory;
+use App\Models\PredefinedKit;
+use App\Models\PredefinedLicence;
+use App\Models\PredefinedModel;
 use Illuminate\Http\Request;
 
-
 /**
  * This controller handles all access kits management:
  * list, add/remove/change
diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index 14df85a080..48ac734283 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -3,12 +3,11 @@
 namespace App\Http\Controllers\Licenses;
 
 use App\Events\CheckoutableCheckedIn;
-use App\Models\Asset;
+use App\Http\Controllers\Controller;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Session;
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 5d878a1506..8edbc2e664 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -3,16 +3,13 @@
 namespace App\Http\Controllers\Licenses;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
 use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
 
 class LicenseCheckoutController extends Controller
 {
diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php
index 4ff388335b..d6ff14ddce 100644
--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -2,14 +2,14 @@
 
 namespace App\Http\Controllers\Licenses;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetFileRequest;
 use App\Models\Actionlog;
 use App\Models\License;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class LicenseFilesController extends Controller
 {
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index 1e6f926c1b..428dfa4f4f 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -1,13 +1,13 @@
 <?php
 namespace App\Http\Controllers\Licenses;
 
-use App\Http\Controllers\Controller;
-use App\Models\License;
-use Illuminate\Support\Facades\DB;
-use App\Models\Company;
 use App\Helpers\Helper;
-use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\License;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 /**
  * This controller handles all actions related to Licenses for
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 8d826d6b04..6f86bcae9f 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -2,10 +2,9 @@
 namespace App\Http\Controllers;
 
 
+use App\Http\Requests\ImageUploadRequest;
 use App\Models\Location;
 use Illuminate\Support\Facades\Auth;
-use Image;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
 
 /**
diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index 928f89fb66..06162924cb 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -3,11 +3,10 @@ namespace App\Http\Controllers;
 
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Manufacturer;
-use Illuminate\Support\Facades\Auth;
-use Redirect;
 use Illuminate\Http\Request;
-use Image;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
+use Redirect;
 
 /**
  * This controller handles all actions related to Manufacturers for
diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index 168a46e5bb..d5b993d3a0 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 use App\Helpers\Helper;
 
 class ModalController extends Controller
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 65079487a7..283fdf0906 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -1,18 +1,16 @@
 <?php
 namespace App\Http\Controllers;
 
-use Image;
-use Input;
-use Redirect;
-use View;
-use Auth;
-use App\Helpers\Helper;
+use App\Http\Requests\ImageUploadRequest;
 use App\Models\Setting;
+use Auth;
 use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Image;
+use Redirect;
+use View;
 
 /**
  * This controller handles all actions related to User Profiles for
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 23ffd7a6c6..c5870e52d0 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -6,18 +6,18 @@ use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use App\Models\CustomField;
 use App\Models\CheckoutAcceptance;
+use App\Models\CustomField;
 use App\Models\Depreciation;
 use App\Models\License;
 use App\Models\Setting;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Illuminate\Http\Request;
 
 /**
  * This controller handles all actions related to Reports for
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 3c86bcca40..147ee0808b 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -11,7 +11,6 @@ use App\Notifications\FirstAdminNotification;
 use App\Notifications\MailTest;
 use Artisan;
 use Auth;
-use Config;
 use Crypt;
 use DB;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php
index 7908d8865b..7308f6584e 100755
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -1,11 +1,11 @@
 <?php
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Input;
-use App\Models\Statuslabel;
 use App\Helpers\Helper;
-use Illuminate\Support\Facades\Auth;
+use App\Models\Statuslabel;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 
 /**
  * This controller handles all actions related to Status Labels for
diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php
index 89d53772c0..2f88d48d5a 100755
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -1,12 +1,9 @@
 <?php
 namespace App\Http\Controllers;
 
-use Image;
+use App\Http\Requests\ImageUploadRequest;
 use App\Models\Supplier;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;
 
 /**
  * This controller handles all actions related to Suppliers for
diff --git a/app/Http/Controllers/Users/LDAPImportController.php b/app/Http/Controllers/Users/LDAPImportController.php
index 3abd1d1c0e..6ba1d2210e 100644
--- a/app/Http/Controllers/Users/LDAPImportController.php
+++ b/app/Http/Controllers/Users/LDAPImportController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Users;
 
+use App\Http\Controllers\Controller;
 use App\Models\Ldap;
 use App\Services\LdapAd;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Artisan;
 
 class LDAPImportController extends Controller
diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php
index db812e1072..c56a3638f8 100644
--- a/app/Http/Controllers/Users/UserFilesController.php
+++ b/app/Http/Controllers/Users/UserFilesController.php
@@ -2,13 +2,12 @@
 
 namespace App\Http\Controllers\Users;
 
-use App\Http\Requests\AssetFileRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\AssetFileRequest;
 use App\Models\Actionlog;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
-
 use Illuminate\Support\Facades\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 0e938e42b3..bb0d4bcd7c 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -4,39 +4,19 @@ namespace App\Http\Controllers\Users;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\UserNotFoundException;
-use App\Http\Requests\AssetFileRequest;
 use App\Http\Requests\SaveUserRequest;
-use App\Models\Accessory;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Group;
 use App\Models\Ldap;
-use App\Models\License;
-use App\Models\LicenseSeat;
-use App\Models\Location;
-use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
-use Artisan;
 use Auth;
-use Config;
-use Crypt;
-use DB;
-use Gate;
-use HTML;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\Request;
 use Input;
-use Lang;
-use League\Csv\Reader;
-use Mail;
 use Redirect;
-use Response;
 use Str;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use URL;
 use View;
 
 /**
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index 03aa03bbee..9efb9d24d4 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -7,13 +7,11 @@ use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
-use App\Notifications\RequestAssetNotification;
 use App\Notifications\RequestAssetCancelationNotification;
+use App\Notifications\RequestAssetNotification;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
 use Redirect;
-use Illuminate\Http\Request;
 
 /**
  * This controller handles all actions related to the ability for users
diff --git a/app/Http/Middleware/CheckForDebug.php b/app/Http/Middleware/CheckForDebug.php
index ff78fd31ba..923b76b1c6 100644
--- a/app/Http/Middleware/CheckForDebug.php
+++ b/app/Http/Middleware/CheckForDebug.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Closure;
 use Auth;
+use Closure;
 
 class CheckForDebug
 {
diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php
index fca16d110e..4cf7e72424 100644
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -2,12 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Closure;
-use Config;
-use Route;
-use Schema;
-use App\Models\User;
 use App\Models\Setting;
+use Closure;
 
 class CheckForSetup
 {
diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php
index 60df26ad61..4cf7e265cc 100644
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/app/Http/Middleware/CheckForTwoFactor.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use App\Models\Setting;
 use Auth;
 use Closure;
-use App\Models\Setting;
 
 class CheckForTwoFactor
 {
diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php
index 3e42a7a901..75cba13261 100644
--- a/app/Http/Middleware/CheckLocale.php
+++ b/app/Http/Middleware/CheckLocale.php
@@ -2,9 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Closure;
-use Config;
 use App\Models\Setting;
+use Closure;
 
 class CheckLocale
 {
diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php
index 41786776c5..a0b5be6ad6 100644
--- a/app/Http/Middleware/CheckPermissions.php
+++ b/app/Http/Middleware/CheckPermissions.php
@@ -3,8 +3,6 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Config;
-use Route;
 use Gate;
 
 class CheckPermissions
diff --git a/app/Http/Requests/AssetCheckinRequest.php b/app/Http/Requests/AssetCheckinRequest.php
index b9b87f1309..116b8b39f2 100644
--- a/app/Http/Requests/AssetCheckinRequest.php
+++ b/app/Http/Requests/AssetCheckinRequest.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
-
 class AssetCheckinRequest extends Request
 {
     /**
diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php
index 66b861525e..afe46440ed 100644
--- a/app/Http/Requests/AssetCheckoutRequest.php
+++ b/app/Http/Requests/AssetCheckoutRequest.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
-
 class AssetCheckoutRequest extends Request
 {
     /**
diff --git a/app/Http/Requests/AssetFileRequest.php b/app/Http/Requests/AssetFileRequest.php
index 5a0aa5f003..df5c4bdb2a 100644
--- a/app/Http/Requests/AssetFileRequest.php
+++ b/app/Http/Requests/AssetFileRequest.php
@@ -3,8 +3,6 @@
 namespace App\Http\Requests;
 
 
-use Symfony\Component\HttpFoundation\JsonResponse;
-
 class AssetFileRequest extends Request
 {
     /**
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 19a5453316..ad23f9cf42 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -5,7 +5,6 @@ namespace App\Http\Requests;
 use App\Models\SnipeModel;
 use Intervention\Image\Facades\Image;
 use Storage;
-use Illuminate\Support\Facades\File;
 
 class ImageUploadRequest extends Request
 {
diff --git a/app/Http/Requests/LicenseCheckoutRequest.php b/app/Http/Requests/LicenseCheckoutRequest.php
index dd84171452..a40c91653e 100644
--- a/app/Http/Requests/LicenseCheckoutRequest.php
+++ b/app/Http/Requests/LicenseCheckoutRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Models\LicenseSeat;
 use Illuminate\Foundation\Http\FormRequest;
 
 class LicenseCheckoutRequest extends FormRequest
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 7ab4fc16b2..35bfcdee93 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 use App\Helpers\Helper;
-
 use Illuminate\Foundation\Http\FormRequest;
 
 abstract class Request extends FormRequest
diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php
index 57dc455195..fac0acdc60 100644
--- a/app/Http/Requests/SaveUserRequest.php
+++ b/app/Http/Requests/SaveUserRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
 use App\Models\Setting;
 
 class SaveUserRequest extends Request
diff --git a/app/Http/Requests/SettingsLdapRequest.php b/app/Http/Requests/SettingsLdapRequest.php
index 443404ac15..8cfef0d995 100644
--- a/app/Http/Requests/SettingsLdapRequest.php
+++ b/app/Http/Requests/SettingsLdapRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
 use Session;
 
 class SettingsLdapRequest extends Request
diff --git a/app/Http/Requests/SetupUserRequest.php b/app/Http/Requests/SetupUserRequest.php
index a58595f757..2906d7d945 100644
--- a/app/Http/Requests/SetupUserRequest.php
+++ b/app/Http/Requests/SetupUserRequest.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
-
 class SetupUserRequest extends Request
 {
     /**
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 1f828bd1eb..13a62c70b3 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\Accessory;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
 use Illuminate\Support\Facades\Storage;
 
 class AccessoriesTransformer
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index c5ea16f598..eb1a1340b7 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -1,11 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\Actionlog;
 use App\Models\Setting;
-use Gate;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
 
 class ActionlogsTransformer
 {
diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index fc11d7a534..1846db3d6b 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\AssetMaintenance;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
 
 class AssetMaintenancesTransformer
 {
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index a344e76d03..e74451594b 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\AssetModel;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\AssetModel;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class AssetModelsTransformer
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 82b2731cb2..882b60ff76 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -1,11 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Asset;
-use Illuminate\Database\Eloquent\Collection;
-use App\Http\Transformers\UsersTransformer;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Asset;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 class AssetsTransformer
 {
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index b93790f771..a76e8c0c19 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Category;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Category;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class CategoriesTransformer
diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php
index 7fac8ee6d0..616353e9a8 100644
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Company;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Company;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class CompaniesTransformer
diff --git a/app/Http/Transformers/ComponentsAssetsTransformer.php b/app/Http/Transformers/ComponentsAssetsTransformer.php
index f8a169ca32..a38236e726 100644
--- a/app/Http/Transformers/ComponentsAssetsTransformer.php
+++ b/app/Http/Transformers/ComponentsAssetsTransformer.php
@@ -2,10 +2,8 @@
 namespace App\Http\Transformers;
 
 use App\Models\Asset;
-use Illuminate\Database\Eloquent\Collection;
-use App\Http\Transformers\UsersTransformer;
 use Gate;
-
+use Illuminate\Database\Eloquent\Collection;
 
 class ComponentsAssetsTransformer
 {
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index 6cd4b98c70..f81da099d4 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Component;
-use Illuminate\Database\Eloquent\Collection;
 use App\Helpers\Helper;
+use App\Models\Component;
 use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class ComponentsTransformer
@@ -35,10 +35,6 @@ class ComponentsTransformer
                 'id' => (int) $component->category->id,
                 'name' => e($component->category->name)
             ] : null,
-            'location' => ($component->location) ? [
-                'id' => (int) $component->location->id,
-                'name' => e($component->location->name)
-            ] : null,
             'order_number'  => e($component->order_number),
             'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
index 36ec8d9c24..9d51c5e5c4 100644
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Consumable;
-use Illuminate\Database\Eloquent\Collection;
 use App\Helpers\Helper;
+use App\Models\Consumable;
 use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class ConsumablesTransformer
diff --git a/app/Http/Transformers/CustomFieldsTransformer.php b/app/Http/Transformers/CustomFieldsTransformer.php
index 1f8f02e278..1ef6904de8 100644
--- a/app/Http/Transformers/CustomFieldsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsTransformer.php
@@ -1,10 +1,9 @@
 <?php
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\CustomField;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
-use Gate;
 
 class CustomFieldsTransformer
 {
diff --git a/app/Http/Transformers/CustomFieldsetsTransformer.php b/app/Http/Transformers/CustomFieldsetsTransformer.php
index 040931b5e7..260164ef8c 100644
--- a/app/Http/Transformers/CustomFieldsetsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsetsTransformer.php
@@ -1,12 +1,9 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\CustomFieldset;
-use App\Models\CustomField;
-use App\Models\AssetModel;
-use Illuminate\Database\Eloquent\Collection;
 use App\Helpers\Helper;
-use Gate;
+use App\Models\CustomFieldset;
+use Illuminate\Database\Eloquent\Collection;
 
 class CustomFieldsetsTransformer
 {
diff --git a/app/Http/Transformers/DatatablesTransformer.php b/app/Http/Transformers/DatatablesTransformer.php
index a9a8a5e4f6..0fc90bec8c 100644
--- a/app/Http/Transformers/DatatablesTransformer.php
+++ b/app/Http/Transformers/DatatablesTransformer.php
@@ -1,9 +1,6 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Location;
-
-
 class DatatablesTransformer
 {
 
diff --git a/app/Http/Transformers/DepartmentsTranformer.php b/app/Http/Transformers/DepartmentsTranformer.php
index a24943b96e..83517ccd43 100644
--- a/app/Http/Transformers/DepartmentsTranformer.php
+++ b/app/Http/Transformers/DepartmentsTranformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Department;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Department;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class DepartmentsTransformer
diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php
index 70304005c9..5f66eef8b4 100644
--- a/app/Http/Transformers/DepreciationsTransformer.php
+++ b/app/Http/Transformers/DepreciationsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Depreciation;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Depreciation;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 class DepreciationsTransformer
 {
diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php
index 3cec01f99f..8f116aad76 100644
--- a/app/Http/Transformers/GroupsTransformer.php
+++ b/app/Http/Transformers/GroupsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Group;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Group;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 class GroupsTransformer
 {
diff --git a/app/Http/Transformers/ImportsTransformer.php b/app/Http/Transformers/ImportsTransformer.php
index 51c1628776..813819c193 100644
--- a/app/Http/Transformers/ImportsTransformer.php
+++ b/app/Http/Transformers/ImportsTransformer.php
@@ -3,7 +3,6 @@ namespace App\Http\Transformers;
 
 use App\Models\Import;
 use App\Models\Setting;
-use Illuminate\Database\Eloquent\Collection;
 
 class ImportsTransformer
 {
diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php
index 65bb410ed7..580838034a 100644
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -1,11 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\LicenseSeat;
 use App\Models\License;
+use App\Models\LicenseSeat;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
 
 class LicenseSeatsTransformer
 {
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index fa7630e8de..5a668b2f62 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\License;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
-use App\Helpers\Helper;
 
 class LicensesTransformer
 {
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index ce018d4f6c..f145a37715 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Location;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Location;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class LocationsTransformer
diff --git a/app/Http/Transformers/LoginAttemptsTransformer.php b/app/Http/Transformers/LoginAttemptsTransformer.php
index ca6d7ffbe0..a0af36d121 100644
--- a/app/Http/Transformers/LoginAttemptsTransformer.php
+++ b/app/Http/Transformers/LoginAttemptsTransformer.php
@@ -1,8 +1,6 @@
 <?php
 namespace App\Http\Transformers;
 
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
 
 class LoginAttemptsTransformer
diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php
index 5457d1c947..860652ef0a 100644
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Manufacturer;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Manufacturer;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class ManufacturersTransformer
diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php
index 8ff4664f44..f130a659df 100644
--- a/app/Http/Transformers/PredefinedKitsTransformer.php
+++ b/app/Http/Transformers/PredefinedKitsTransformer.php
@@ -2,9 +2,9 @@
 namespace App\Http\Transformers;
 
 use App\Models\PredefinedKit;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Models\SnipeModel;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 /**
  * transforms collection of models to array with simple typres
diff --git a/app/Http/Transformers/StatuslabelsTransformer.php b/app/Http/Transformers/StatuslabelsTransformer.php
index f76557a0bf..b320129f37 100644
--- a/app/Http/Transformers/StatuslabelsTransformer.php
+++ b/app/Http/Transformers/StatuslabelsTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Statuslabel;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Statuslabel;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 class StatuslabelsTransformer
 {
diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index a3bb8c6f27..44f483deac 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\Supplier;
-use Illuminate\Database\Eloquent\Collection;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\Supplier;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 
 class SuppliersTransformer
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index 1f14ab219c..e0fe00814e 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -1,11 +1,10 @@
 <?php
 namespace App\Http\Transformers;
 
-use App\Models\User;
-use Illuminate\Database\Eloquent\Collection;
-use phpDocumentor\Reflection\Types\Integer;
-use Gate;
 use App\Helpers\Helper;
+use App\Models\User;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
 
 class UsersTransformer
 {
diff --git a/app/Importer/AccessoryImporter.php b/app/Importer/AccessoryImporter.php
index eaf24783eb..709b58ea3c 100644
--- a/app/Importer/AccessoryImporter.php
+++ b/app/Importer/AccessoryImporter.php
@@ -2,7 +2,6 @@
 
 namespace App\Importer;
 
-use App\Helpers\Helper;
 use App\Models\Accessory;
 
 class AccessoryImporter extends ItemImporter
diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index b477e4e580..be758e7956 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -2,10 +2,7 @@
 
 namespace App\Importer;
 
-use App\Helpers\Helper;
 use App\Models\Asset;
-use App\Models\Category;
-use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 
 class AssetImporter extends ItemImporter
diff --git a/app/Importer/ConsumableImporter.php b/app/Importer/ConsumableImporter.php
index a25a8b56f7..e7972bb2cd 100644
--- a/app/Importer/ConsumableImporter.php
+++ b/app/Importer/ConsumableImporter.php
@@ -2,7 +2,6 @@
 
 namespace App\Importer;
 
-use App\Helpers\Helper;
 use App\Models\Consumable;
 
 class ConsumableImporter extends ItemImporter
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
index 4885fb4c1e..e917974f8f 100644
--- a/app/Importer/Importer.php
+++ b/app/Importer/Importer.php
@@ -2,12 +2,11 @@
 namespace App\Importer;
 
 use App\Models\CustomField;
+use App\Models\Department;
 use App\Models\Setting;
 use App\Models\User;
-use App\Models\Department;
 use ForceUTF8\Encoding;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use League\Csv\Reader;
 
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 4895545e22..0fa94b2f2f 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -2,7 +2,6 @@
 
 namespace App\Importer;
 
-use App\Importer\UserImporter;
 use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\Company;
@@ -10,7 +9,6 @@ use App\Models\Location;
 use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
-use App\Models\Department;
 use App\Models\User;
 
 class ItemImporter extends Importer
diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php
index 7be62b7b44..8009735bb7 100644
--- a/app/Importer/LicenseImporter.php
+++ b/app/Importer/LicenseImporter.php
@@ -2,11 +2,8 @@
 
 namespace App\Importer;
 
-use App\Helpers\Helper;
 use App\Models\Asset;
-use App\Models\Category;
 use App\Models\License;
-use App\Models\Manufacturer;
 
 class LicenseImporter extends ItemImporter
 {
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 4b8b75ad93..acbfab54f7 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -2,7 +2,6 @@
 
 namespace App\Importer;
 
-use App\Helpers\Helper;
 use App\Models\Department;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
diff --git a/app/LegacyEncrypter/McryptEncrypter.php b/app/LegacyEncrypter/McryptEncrypter.php
index 90e92bf4ef..ac0a49fc58 100644
--- a/app/LegacyEncrypter/McryptEncrypter.php
+++ b/app/LegacyEncrypter/McryptEncrypter.php
@@ -3,10 +3,10 @@
 namespace App\LegacyEncrypter;
 
 use Exception;
-use RuntimeException;
 use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Contracts\Encryption\EncryptException;
 use Illuminate\Contracts\Encryption\Encrypter as EncrypterContract;
+use Illuminate\Contracts\Encryption\EncryptException;
+use RuntimeException;
 
 /**
  * @deprecated since version 5.1. Use Illuminate\Encryption\Encrypter.
diff --git a/app/Listeners/LogFailedLogin.php b/app/Listeners/LogFailedLogin.php
index 4f484323e5..663b4559c1 100644
--- a/app/Listeners/LogFailedLogin.php
+++ b/app/Listeners/LogFailedLogin.php
@@ -2,10 +2,9 @@
 
 namespace App\Listeners;
 
-use Illuminate\Auth\Events\Failed;
-use Illuminate\Http\Request;
-use DB;
 use Carbon\Carbon;
+use DB;
+use Illuminate\Auth\Events\Failed;
 
 class LogFailedLogin
 {
diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php
index cdb4fda1fc..9d0da17470 100644
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -6,10 +6,10 @@ use App\Events\AccessoryCheckedIn;
 use App\Events\AccessoryCheckedOut;
 use App\Events\AssetCheckedIn;
 use App\Events\AssetCheckedOut;
-use App\Events\CheckoutAccepted;
-use App\Events\CheckoutDeclined;
 use App\Events\CheckoutableCheckedIn;
 use App\Events\CheckoutableCheckedOut;
+use App\Events\CheckoutAccepted;
+use App\Events\CheckoutDeclined;
 use App\Events\ComponentCheckedIn;
 use App\Events\ComponentCheckedOut;
 use App\Events\ConsumableCheckedOut;
@@ -18,11 +18,8 @@ use App\Events\ItemDeclined;
 use App\Events\LicenseCheckedIn;
 use App\Events\LicenseCheckedOut;
 use App\Models\Actionlog;
-use App\Models\Asset;
-use App\Models\Component;
 use App\Models\LicenseSeat;
 
-
 class LogListener
 {
 
@@ -87,4 +84,4 @@ class LogListener
         }         
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Listeners/LogSuccessfulLogin.php b/app/Listeners/LogSuccessfulLogin.php
index 78450b8041..0fab5d00f6 100644
--- a/app/Listeners/LogSuccessfulLogin.php
+++ b/app/Listeners/LogSuccessfulLogin.php
@@ -2,10 +2,9 @@
 
 namespace App\Listeners;
 
-use Illuminate\Auth\Events\Login;
-use Illuminate\Http\Request;
-use DB;
 use Carbon\Carbon;
+use DB;
+use Illuminate\Auth\Events\Login;
 
 class LogSuccessfulLogin
 {
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 41dee8ef13..25c835d382 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -5,10 +5,8 @@ use App\Models\Traits\Acceptable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Watson\Validating\ValidatingTrait;
-use App\Notifications\CheckinAccessoryNotification;
-use App\Notifications\CheckoutAccessoryNotification;
 use Illuminate\Support\Facades\Storage;
+use Watson\Validating\ValidatingTrait;
 
 /**
  * Model for Accessories.
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index f28ab36895..7540568387 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -2,11 +2,9 @@
 namespace App\Models;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
+use Carbon;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
-use Response;
-use Carbon;
 
 /**
  * Model for the Actionlog (the table that keeps a historical log of
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 8909636059..3786b75560 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -3,25 +3,20 @@ namespace App\Models;
 
 use App\Events\AssetCheckedOut;
 use App\Events\CheckoutableCheckedOut;
-use App\Exceptions\CheckoutNotAllowed;
 use App\Http\Traits\UniqueSerialTrait;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\Searchable;
-use App\Models\User;
 use App\Presenters\Presentable;
 use AssetPresenter;
 use Auth;
 use Carbon\Carbon;
-use Config;
+use DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Log;
-use Watson\Validating\ValidatingTrait;
-use DB;
-use App\Notifications\CheckinAssetNotification;
-use App\Notifications\CheckoutAssetNotification;
 use Illuminate\Support\Facades\Storage;
+use Watson\Validating\ValidatingTrait;
+
 /**
  * Model for Assets.
  *
diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
index 557f3fd791..18b7b8205c 100644
--- a/app/Models/AssetMaintenance.php
+++ b/app/Models/AssetMaintenance.php
@@ -4,7 +4,6 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\Searchable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Lang;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
@@ -75,7 +74,6 @@ class AssetMaintenance extends Model implements ICompanyableChild
             trans('admin/asset_maintenances/general.upgrade')     => trans('admin/asset_maintenances/general.upgrade'),
             'PAT test'      => 'PAT test',
             trans('admin/asset_maintenances/general.calibration')     => trans('admin/asset_maintenances/general.calibration'),
-            'PAT test'      => 'PAT test',
         ];
     }
 
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index e2d58fa40d..f32ac0d414 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -1,14 +1,11 @@
 <?php
 namespace App\Models;
 
-use App\Models\Requestable;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Watson\Validating\ValidatingTrait;
 use Illuminate\Support\Facades\Storage;
+use Watson\Validating\ValidatingTrait;
 
 /**
  * Model for Asset Models. Asset Models contain higher level
diff --git a/app/Models/Category.php b/app/Models/Category.php
index c88280df0e..b95ec6cf9e 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -2,10 +2,8 @@
 namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php
index 6ff850f41f..ee4ff505c7 100644
--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php
index df40618317..462af447e9 100644
--- a/app/Models/CheckoutRequest.php
+++ b/app/Models/CheckoutRequest.php
@@ -1,9 +1,8 @@
 <?php
 
 namespace App\Models;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class CheckoutRequest extends Model
 {
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 391a79d6b2..0cbdbd5671 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -1,12 +1,10 @@
 <?php
 namespace App\Models;
 
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Auth;
 use DB;
-use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
 
 /**
diff --git a/app/Models/CompanyableChildScope.php b/app/Models/CompanyableChildScope.php
index e569522b19..e83eb18ed8 100644
--- a/app/Models/CompanyableChildScope.php
+++ b/app/Models/CompanyableChildScope.php
@@ -1,9 +1,9 @@
 <?php
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use \Illuminate\Database\Eloquent\Builder;
-use \Illuminate\Database\Eloquent\Scope;
+use Illuminate\Database\Eloquent\Scope;
 
 /**
  * Handle query scoping for full company support.
diff --git a/app/Models/CompanyableScope.php b/app/Models/CompanyableScope.php
index e99d934b51..ce0c9c7399 100644
--- a/app/Models/CompanyableScope.php
+++ b/app/Models/CompanyableScope.php
@@ -1,9 +1,9 @@
 <?php
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use \Illuminate\Database\Eloquent\Builder;
-use \Illuminate\Database\Eloquent\Scope;
+use Illuminate\Database\Eloquent\Scope;
 
 /**
  * Handle query scoping for full company support.
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index 879e6b2cf6..701b395162 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -5,9 +5,8 @@ use App\Models\Traits\Acceptable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Watson\Validating\ValidatingTrait;
-use App\Notifications\CheckoutConsumableNotification;
 use Illuminate\Support\Facades\Storage;
+use Watson\Validating\ValidatingTrait;
 
 class Consumable extends SnipeModel
 {
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index eb3da01715..5979e614c9 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -1,14 +1,12 @@
 <?php
 namespace App\Models;
 
+use App\Http\Traits\UniqueUndeletedTrait;
+use EasySlugger\Utf8Slugger;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Validation\Rule;
 use Schema;
 use Watson\Validating\ValidatingTrait;
-use App\Http\Traits\UniqueUndeletedTrait;
-use ForceUTF8\Encoding;
-use EasySlugger\Utf8Slugger;
-use Patchwork\Utf8;
-use Illuminate\Validation\Rule;
 
 class CustomField extends Model
 {
diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php
index 82c62750ab..157c193b41 100644
--- a/app/Models/CustomFieldset.php
+++ b/app/Models/CustomFieldset.php
@@ -1,8 +1,8 @@
 <?php
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Gate;
+use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
 
 class CustomFieldset extends Model
diff --git a/app/Models/Department.php b/app/Models/Department.php
index 2589fd6baa..c054f66371 100644
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -4,12 +4,7 @@ namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Searchable;
-use Illuminate\Database\Eloquent\Model;
-use Log;
 use Watson\Validating\ValidatingTrait;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Models\SnipeModel;
-use App\Models\User;
 
 class Department extends SnipeModel
 {
diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php
index b7769fd360..fde9530c45 100644
--- a/app/Models/Depreciable.php
+++ b/app/Models/Depreciable.php
@@ -1,10 +1,6 @@
 <?php
 namespace App\Models;
 
-use App\Models\Depreciation;
-use App\Models\SnipeModel;
-use Illuminate\Database\Eloquent\Model;
-
 class Depreciable extends SnipeModel
 {
     /**
diff --git a/app/Models/Group.php b/app/Models/Group.php
index ea04f035f5..0c492b7752 100755
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -1,7 +1,6 @@
 <?php
 namespace App\Models;
 
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use Watson\Validating\ValidatingTrait;
 
diff --git a/app/Models/License.php b/app/Models/License.php
index 90e3365b08..d077bd48d2 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -1,10 +1,6 @@
 <?php
 namespace App\Models;
 
-use App\Models\Actionlog;
-use App\Models\Company;
-use App\Models\LicenseSeat;
-use App\Models\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Carbon\Carbon;
diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php
index e86959f152..ef0308e741 100755
--- a/app/Models/LicenseSeat.php
+++ b/app/Models/LicenseSeat.php
@@ -1,12 +1,10 @@
 <?php
 namespace App\Models;
 
-use App\Models\Loggable;
 use App\Models\Traits\Acceptable;
 use App\Notifications\CheckinLicenseNotification;
 use App\Notifications\CheckoutLicenseNotification;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class LicenseSeat extends SnipeModel implements ICompanyableChild
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 91e209075e..651792675f 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -2,15 +2,10 @@
 namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
-use App\Models\Asset;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
-use App\Models\User;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
-use DB;
 
 class Location extends SnipeModel
 {
diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index 65236785c3..c2977ca030 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -2,14 +2,9 @@
 
 namespace App\Models;
 
-use App\Models\Actionlog;
-use App\Models\Asset;
-use App\Models\CheckoutRequest;
-use App\Models\User;
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
 
-
 trait Loggable
 {
 
diff --git a/app/Models/PredefinedKit.php b/app/Models/PredefinedKit.php
index 71b7340d38..317cf3cd6a 100644
--- a/app/Models/PredefinedKit.php
+++ b/app/Models/PredefinedKit.php
@@ -1,14 +1,10 @@
 <?php
 namespace App\Models;
 
-use App\Http\Traits\UniqueUndeletedTrait;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Watson\Validating\ValidatingTrait;
 use Illuminate\Validation\Rule;
+use Watson\Validating\ValidatingTrait;
 
 /**
  * Model for predefined kits.
diff --git a/app/Models/Requestable.php b/app/Models/Requestable.php
index 96a45c42f6..5fc3f5450f 100644
--- a/app/Models/Requestable.php
+++ b/app/Models/Requestable.php
@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\CheckoutRequest;
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 
 // $asset->requests
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 11325f0e8a..437938423f 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
-use Parsedown;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
-use Watson\Validating\ValidatingTrait;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Parsedown;
+use Watson\Validating\ValidatingTrait;
 
 /**
  * Settings model.
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php
index f5505a74a8..2911be1c38 100644
--- a/app/Models/SnipeModel.php
+++ b/app/Models/SnipeModel.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Helpers\Helper;
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 class SnipeModel extends Model
diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php
index c97b6c9c70..cd4672b841 100755
--- a/app/Models/Statuslabel.php
+++ b/app/Models/Statuslabel.php
@@ -2,9 +2,7 @@
 namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 2313e998a9..230a713cda 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -2,9 +2,7 @@
 namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
-use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
diff --git a/app/Models/Traits/Acceptable.php b/app/Models/Traits/Acceptable.php
index a0c93a861b..4da3575182 100644
--- a/app/Models/Traits/Acceptable.php
+++ b/app/Models/Traits/Acceptable.php
@@ -2,10 +2,7 @@
 
 namespace App\Models\Traits;
 
-use App\Models\Asset;
-use App\Models\CustomField;
 use App\Models\User;
-use Illuminate\Database\Eloquent\Builder;
 
 /**
  * This trait allows models to have a callback after their checkout gets accepted or declined.
diff --git a/app/Models/User.php b/app/Models/User.php
index 7684e14607..36d57cfd08 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -1,24 +1,22 @@
 <?php
 namespace App\Models;
 
+use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Illuminate\Auth\Passwords\CanResetPassword;
-use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use DB;
 use Illuminate\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
-use Watson\Validating\ValidatingTrait;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Http\Traits\UniqueUndeletedTrait;
+use Illuminate\Foundation\Auth\Access\Authorizable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Passport\HasApiTokens;
-use Illuminate\Contracts\Translation\HasLocalePreference;
-use DB;
-
-
+use Watson\Validating\ValidatingTrait;
 
 class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
 {
diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php
index 20d3b4a090..5629e82f33 100644
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -6,7 +6,6 @@ use App\Models\Setting;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
 
 class AuditNotification extends Notification
 {
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
index ee3bcac6ab..f6a8b19e96 100644
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -4,14 +4,11 @@ namespace App\Notifications;
 
 use App\Models\Accessory;
 use App\Models\Setting;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
 
 class CheckinAccessoryNotification extends Notification
 {
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 4053f22ffc..c203168e08 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -6,7 +6,6 @@ use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
index 6851055ce0..f6459bae40 100644
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -2,17 +2,13 @@
 
 namespace App\Notifications;
 
-use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\Setting;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
 
 class CheckinLicenseSeatNotification extends Notification
 {
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
index 11368bf06c..2e69856236 100644
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -4,14 +4,11 @@ namespace App\Notifications;
 
 use App\Models\Accessory;
 use App\Models\Setting;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
 
 class CheckoutAccessoryNotification extends Notification
 {
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index db4ba294f5..8c93f08c54 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -9,7 +9,6 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class CheckoutAssetNotification extends Notification
 {
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index 40780c7abc..a9785677cd 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -4,14 +4,11 @@ namespace App\Notifications;
 
 use App\Models\Consumable;
 use App\Models\Setting;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
 
 class CheckoutConsumableNotification extends Notification
 {
diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php
index 74df6e2f46..fd21295210 100644
--- a/app/Notifications/CheckoutLicenseSeatNotification.php
+++ b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -2,17 +2,13 @@
 
 namespace App\Notifications;
 
-use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\Setting;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
 
 class CheckoutLicenseSeatNotification extends Notification
 {
diff --git a/app/Notifications/CurrentInventory.php b/app/Notifications/CurrentInventory.php
index b39c7245c6..3948fe9c0d 100644
--- a/app/Notifications/CurrentInventory.php
+++ b/app/Notifications/CurrentInventory.php
@@ -3,9 +3,8 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class CurrentInventory extends Notification
 {
diff --git a/app/Notifications/ExpectedCheckinAdminNotification.php b/app/Notifications/ExpectedCheckinAdminNotification.php
index 6dd481ea1f..743e801d96 100644
--- a/app/Notifications/ExpectedCheckinAdminNotification.php
+++ b/app/Notifications/ExpectedCheckinAdminNotification.php
@@ -2,14 +2,9 @@
 
 namespace App\Notifications;
 
-use App\Models\Setting;
-use App\Models\SnipeModel;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
-use Carbon\Carbon;
 
 class ExpectedCheckinAdminNotification extends Notification
 {
diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.php
index 3dc41950d9..06d5589e90 100644
--- a/app/Notifications/ExpectedCheckinNotification.php
+++ b/app/Notifications/ExpectedCheckinNotification.php
@@ -2,14 +2,10 @@
 
 namespace App\Notifications;
 
-use App\Models\Setting;
-use App\Models\SnipeModel;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
-use Carbon\Carbon;
 
 class ExpectedCheckinNotification extends Notification
 {
diff --git a/app/Notifications/ExpiringLicenseNotification.php b/app/Notifications/ExpiringLicenseNotification.php
index 81798f6ca6..fce8ba23ef 100644
--- a/app/Notifications/ExpiringLicenseNotification.php
+++ b/app/Notifications/ExpiringLicenseNotification.php
@@ -6,7 +6,6 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-
 class ExpiringLicenseNotification extends Notification
 {
     use Queueable;
diff --git a/app/Notifications/FirstAdminNotification.php b/app/Notifications/FirstAdminNotification.php
index bf802070da..951e24e72b 100644
--- a/app/Notifications/FirstAdminNotification.php
+++ b/app/Notifications/FirstAdminNotification.php
@@ -3,9 +3,8 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class FirstAdminNotification extends Notification
 {
diff --git a/app/Notifications/InventoryAlert.php b/app/Notifications/InventoryAlert.php
index 0d9a26fc2e..31b61a13ae 100644
--- a/app/Notifications/InventoryAlert.php
+++ b/app/Notifications/InventoryAlert.php
@@ -3,8 +3,8 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class InventoryAlert extends Notification
 {
diff --git a/app/Notifications/MailTest.php b/app/Notifications/MailTest.php
index 421cf7f988..1e84fab8e9 100644
--- a/app/Notifications/MailTest.php
+++ b/app/Notifications/MailTest.php
@@ -4,9 +4,8 @@ namespace App\Notifications;
 
 use App\Models\Settings;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class MailTest extends Notification
 {
diff --git a/app/Notifications/SlackTest.php b/app/Notifications/SlackTest.php
index 213b21315e..1d18be86a1 100644
--- a/app/Notifications/SlackTest.php
+++ b/app/Notifications/SlackTest.php
@@ -2,10 +2,10 @@
 
 namespace App\Notifications;
 
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\SlackMessage;
 use App\Models\Setting;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
 
 class SlackTest extends Notification
 {
diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.php
index 837a4e6d8b..0fc3377708 100644
--- a/app/Notifications/WelcomeNotification.php
+++ b/app/Notifications/WelcomeNotification.php
@@ -3,9 +3,8 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class WelcomeNotification extends Notification
 {
diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.php
index f84f12d116..1dd3e40437 100644
--- a/app/Observers/AccessoryObserver.php
+++ b/app/Observers/AccessoryObserver.php
@@ -3,7 +3,6 @@
 namespace App\Observers;
 
 use App\Models\Accessory;
-use App\Models\Setting;
 use App\Models\Actionlog;
 use Auth;
 
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index b435e9cb68..164792a3a9 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -2,9 +2,9 @@
 
 namespace App\Observers;
 
+use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Setting;
-use App\Models\Actionlog;
 use Auth;
 
 class AssetObserver
diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php
index 054520fc8e..3cb0aeda6c 100644
--- a/app/Observers/ComponentObserver.php
+++ b/app/Observers/ComponentObserver.php
@@ -2,9 +2,8 @@
 
 namespace App\Observers;
 
-use App\Models\Component;
-use App\Models\Setting;
 use App\Models\Actionlog;
+use App\Models\Component;
 use Auth;
 
 class ComponentObserver
diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php
index 4b41df0782..22c94f2688 100644
--- a/app/Observers/ConsumableObserver.php
+++ b/app/Observers/ConsumableObserver.php
@@ -2,9 +2,8 @@
 
 namespace App\Observers;
 
-use App\Models\Consumable;
-use App\Models\Setting;
 use App\Models\Actionlog;
+use App\Models\Consumable;
 use Auth;
 
 class ConsumableObserver
diff --git a/app/Observers/LicenseObserver.php b/app/Observers/LicenseObserver.php
index 19c85ae923..5f0132f208 100644
--- a/app/Observers/LicenseObserver.php
+++ b/app/Observers/LicenseObserver.php
@@ -2,9 +2,8 @@
 
 namespace App\Observers;
 
-use App\Models\License;
-use App\Models\Setting;
 use App\Models\Actionlog;
+use App\Models\License;
 use Auth;
 
 class LicenseObserver
diff --git a/app/Policies/AccessoryPolicy.php b/app/Policies/AccessoryPolicy.php
index b010f844ef..68ede35148 100644
--- a/app/Policies/AccessoryPolicy.php
+++ b/app/Policies/AccessoryPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\CheckoutablePermissionsPolicy;
-
 class AccessoryPolicy extends CheckoutablePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/AssetModelPolicy.php b/app/Policies/AssetModelPolicy.php
index 84fb495691..d540f2bf09 100644
--- a/app/Policies/AssetModelPolicy.php
+++ b/app/Policies/AssetModelPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class AssetModelPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/AssetPolicy.php b/app/Policies/AssetPolicy.php
index 4519160f29..2384dfd836 100644
--- a/app/Policies/AssetPolicy.php
+++ b/app/Policies/AssetPolicy.php
@@ -3,7 +3,6 @@
 namespace App\Policies;
 
 use App\Models\User;
-use App\Policies\CheckoutablePermissionsPolicy;
 
 class AssetPolicy extends CheckoutablePermissionsPolicy
 {
diff --git a/app/Policies/CategoryPolicy.php b/app/Policies/CategoryPolicy.php
index 3ec1274f6f..89e209d1e3 100644
--- a/app/Policies/CategoryPolicy.php
+++ b/app/Policies/CategoryPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class CategoryPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/CheckoutablePermissionsPolicy.php b/app/Policies/CheckoutablePermissionsPolicy.php
index 5d2b975d2c..d1c39ae314 100644
--- a/app/Policies/CheckoutablePermissionsPolicy.php
+++ b/app/Policies/CheckoutablePermissionsPolicy.php
@@ -3,7 +3,6 @@ namespace App\Policies;
 
 
 use App\Models\User;
-use App\Policies\SnipePermissionsPolicy;
 
 abstract class CheckoutablePermissionsPolicy extends SnipePermissionsPolicy
 {
diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php
index 7efcc99f3d..78d1b831b4 100644
--- a/app/Policies/CompanyPolicy.php
+++ b/app/Policies/CompanyPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class CompanyPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/ComponentPolicy.php b/app/Policies/ComponentPolicy.php
index b6a64d5b69..0ff5b2c8d6 100644
--- a/app/Policies/ComponentPolicy.php
+++ b/app/Policies/ComponentPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\CheckoutablePermissionsPolicy;
-
 class ComponentPolicy extends CheckoutablePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/ConsumablePolicy.php b/app/Policies/ConsumablePolicy.php
index 9df229a4d4..3d8d133a54 100644
--- a/app/Policies/ConsumablePolicy.php
+++ b/app/Policies/ConsumablePolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\CheckoutablePermissionsPolicy;
-
 class ConsumablePolicy extends CheckoutablePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/CustomFieldPolicy.php b/app/Policies/CustomFieldPolicy.php
index 4f5f947185..1415fa3126 100644
--- a/app/Policies/CustomFieldPolicy.php
+++ b/app/Policies/CustomFieldPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class CustomFieldPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/CustomFieldsetPolicy.php b/app/Policies/CustomFieldsetPolicy.php
index ca7bd4bb30..0d95cbafe5 100644
--- a/app/Policies/CustomFieldsetPolicy.php
+++ b/app/Policies/CustomFieldsetPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class CustomFieldsetPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/DepartmentPolicy.php b/app/Policies/DepartmentPolicy.php
index 5dc71311c1..e1d7b672ab 100644
--- a/app/Policies/DepartmentPolicy.php
+++ b/app/Policies/DepartmentPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class DepartmentPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/DepreciationPolicy.php b/app/Policies/DepreciationPolicy.php
index cc889b8949..12204f3f36 100644
--- a/app/Policies/DepreciationPolicy.php
+++ b/app/Policies/DepreciationPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class DepreciationPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/LicensePolicy.php b/app/Policies/LicensePolicy.php
index 0fa4f0ca7d..2667b5e119 100644
--- a/app/Policies/LicensePolicy.php
+++ b/app/Policies/LicensePolicy.php
@@ -4,7 +4,6 @@ namespace App\Policies;
 
 use App\Models\License;
 use App\Models\User;
-use App\Policies\CheckoutablePermissionsPolicy;
 
 class LicensePolicy extends CheckoutablePermissionsPolicy
 {
diff --git a/app/Policies/LocationPolicy.php b/app/Policies/LocationPolicy.php
index c0aafec789..57d73e2498 100644
--- a/app/Policies/LocationPolicy.php
+++ b/app/Policies/LocationPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class LocationPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/ManufacturerPolicy.php b/app/Policies/ManufacturerPolicy.php
index 8800b46c30..33febfecc0 100644
--- a/app/Policies/ManufacturerPolicy.php
+++ b/app/Policies/ManufacturerPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class ManufacturerPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/StatuslabelPolicy.php b/app/Policies/StatuslabelPolicy.php
index ca9d554d8c..585404695f 100644
--- a/app/Policies/StatuslabelPolicy.php
+++ b/app/Policies/StatuslabelPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class StatuslabelPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/SupplierPolicy.php b/app/Policies/SupplierPolicy.php
index 6e1e5e1b90..979a99b996 100644
--- a/app/Policies/SupplierPolicy.php
+++ b/app/Policies/SupplierPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class SupplierPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
index e6db28c4cf..ee61ab2499 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Policies\SnipePermissionsPolicy;
-
 class UserPolicy extends SnipePermissionsPolicy
 {
     protected function columnName()
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 1dc0f77ef3..bf7074ad55 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -1,9 +1,6 @@
 <?php
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-use Illuminate\Support\Facades\Gate;
-
 /**
  * Class AccessoryPresenter
  * @package App\Presenters
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index f2671f040f..3d69cd794f 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class AssetModelPresenter
  * @package App\Presenters
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index f23f22b600..419ea2b9bf 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class AssetModelPresenter
  * @package App\Presenters
diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index bceff26c6b..248a875822 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class CategoryPresenter
  * @package App\Presenters
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index c582e60a7c..669b5c651f 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class ComponentPresenter
  * @package App\Presenters
diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php
index c6b17c6348..6bbb538842 100644
--- a/app/Presenters/DepreciationPresenter.php
+++ b/app/Presenters/DepreciationPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class DepreciationPresenter
  * @package App\Presenters
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 0cc226dc48..2c793fd1b4 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -2,9 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-use Illuminate\Support\Facades\Gate;
-
 /**
  * Class LicensePresenter
  * @package App\Presenters
diff --git a/app/Presenters/LicenseSeatPresenter.php b/app/Presenters/LicenseSeatPresenter.php
index 5267aa7290..03f02cbd72 100644
--- a/app/Presenters/LicenseSeatPresenter.php
+++ b/app/Presenters/LicenseSeatPresenter.php
@@ -2,9 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-use Illuminate\Support\Facades\Gate;
-
 /**
  * Class LicensePresenter
  * @package App\Presenters
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 3fc225514a..c3b3442d8b 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class LocationPresenter
  * @package App\Presenters
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index 85a72c1250..c78da85f00 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-
 /**
  * Class ManufacturerPresenter
  * @package App\Presenters
diff --git a/app/Presenters/PredefinedKitPresenter.php b/app/Presenters/PredefinedKitPresenter.php
index aa8b5e2640..dddaff069f 100644
--- a/app/Presenters/PredefinedKitPresenter.php
+++ b/app/Presenters/PredefinedKitPresenter.php
@@ -2,9 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-use Illuminate\Support\Facades\Gate;
-
 /**
  * Class LicensePresenter
  * @package App\Presenters
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index f42010972a..5d24fa974c 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -2,10 +2,6 @@
 
 namespace App\Presenters;
 
-use App\Helpers\Helper;
-use App\Models\Setting;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 
 /**
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 17a4833511..c4f5c731d1 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,22 +2,20 @@
 namespace App\Providers;
 
 
-use App\Models\Setting;
-use App\Observers\SettingObserver;
-use Illuminate\Support\ServiceProvider;
-use Log;
-use Illuminate\Support\Facades\Schema;
-use App\Observers\AssetObserver;
-use App\Observers\LicenseObserver;
-use App\Observers\AccessoryObserver;
-use App\Observers\ConsumableObserver;
-use App\Observers\ComponentObserver;
-use App\Models\Asset;
-use App\Models\License;
 use App\Models\Accessory;
-use App\Models\Consumable;
+use App\Models\Asset;
 use App\Models\Component;
-
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\Setting;
+use App\Observers\AccessoryObserver;
+use App\Observers\AssetObserver;
+use App\Observers\ComponentObserver;
+use App\Observers\ConsumableObserver;
+use App\Observers\LicenseObserver;
+use App\Observers\SettingObserver;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\ServiceProvider;
 
 /**
  * This service provider handles setting the observers on models
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index d5f1dbd582..6674645715 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -6,23 +6,24 @@ use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
+use App\Models\Company;
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use App\Models\Department;
+use App\Models\Depreciation;
 use App\Models\License;
 use App\Models\Location;
-use App\Models\Depreciation;
+use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
-use App\Models\Manufacturer;
-use App\Models\Company;
 use App\Models\User;
 use App\Policies\AccessoryPolicy;
 use App\Policies\AssetModelPolicy;
 use App\Policies\AssetPolicy;
 use App\Policies\CategoryPolicy;
+use App\Policies\CompanyPolicy;
 use App\Policies\ComponentPolicy;
 use App\Policies\ConsumablePolicy;
 use App\Policies\CustomFieldPolicy;
@@ -31,11 +32,10 @@ use App\Policies\DepartmentPolicy;
 use App\Policies\DepreciationPolicy;
 use App\Policies\LicensePolicy;
 use App\Policies\LocationPolicy;
+use App\Policies\ManufacturerPolicy;
 use App\Policies\StatuslabelPolicy;
 use App\Policies\SupplierPolicy;
 use App\Policies\UserPolicy;
-use App\Policies\ManufacturerPolicy;
-use App\Policies\CompanyPolicy;
 use Carbon\Carbon;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 02bf3dc072..f52cdcae15 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 56d95868f7..bcdd5a49c4 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -1,12 +1,7 @@
 <?php
 namespace App\Providers;
 
-use Validator;
 use Illuminate\Support\ServiceProvider;
-use DB;
-use Log;
-
-
 
 /**
  * This service provider handles sharing the snipeSettings variable, and sets
diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
index 78f5f2c4e6..a82b318256 100644
--- a/app/Providers/ValidationServiceProvider.php
+++ b/app/Providers/ValidationServiceProvider.php
@@ -1,22 +1,9 @@
 <?php
 namespace App\Providers;
 
-use Validator;
-use Illuminate\Support\ServiceProvider;
 use DB;
-use Log;
-use Illuminate\Support\Facades\Schema;
-use App\Observers\AssetObserver;
-use App\Observers\LicenseObserver;
-use App\Observers\AccessoryObserver;
-use App\Observers\ConsumableObserver;
-use App\Observers\ComponentObserver;
-use App\Models\Asset;
-use App\Models\License;
-use App\Models\Accessory;
-use App\Models\Consumable;
-use App\Models\Component;
-
+use Illuminate\Support\ServiceProvider;
+use Validator;
 
 /**
  * This service provider handles a few custom validation rules.
diff --git a/app/Services/LdapAd.php b/app/Services/LdapAd.php
index 6718631e2c..ab09307f4c 100644
--- a/app/Services/LdapAd.php
+++ b/app/Services/LdapAd.php
@@ -4,16 +4,15 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use Adldap\Schemas\Schema;
-use App\Models\User;
-use App\Helpers\Helper;
-use Exception;
 use Adldap\Adldap;
+use Adldap\Models\User as AdldapUser;
 use Adldap\Query\Paginator;
+use Adldap\Schemas\Schema;
+use App\Helpers\Helper;
+use App\Models\User;
+use Exception;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
-use Adldap\Models\User as AdldapUser;
-use Adldap\Models\ModelNotFoundException;
 
 /**
  * LDAP queries.
diff --git a/app/Services/PredefinedKitCheckoutService.php b/app/Services/PredefinedKitCheckoutService.php
index 4249e9613b..5b7db980ef 100644
--- a/app/Services/PredefinedKitCheckoutService.php
+++ b/app/Services/PredefinedKitCheckoutService.php
@@ -2,15 +2,13 @@
 
 namespace App\Services;
 
+use App\Events\CheckoutableCheckedOut;
 use App\Models\PredefinedKit;
 use App\Models\User;
-use App\Http\Controllers\CheckInOutRequest;
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use App\Events\CheckoutableCheckedOut;
-
 
 /**
  * Class incapsulates checkout logic for reuse in different controllers
diff --git a/composer.json b/composer.json
index 342907a3ef..ab2faf85ca 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,11 @@
   "type": "project",
   "require": {
     "php": ">=7.1.3",
+    "ext-curl": "*",
+    "ext-fileinfo": "*",
+    "ext-json": "*",
+    "ext-mbstring": "*",
+    "ext-pdo": "*",
     "adldap2/adldap2": "^9.1",
     "bacon/bacon-qr-code": "^1.0",
     "doctrine/cache": "^1.6",
@@ -45,6 +50,7 @@
   },
   "require-dev": {
     "barryvdh/laravel-debugbar": "^3.2",
+    "barryvdh/laravel-ide-helper": "^2.6",
     "codeception/codeception": "^2.4",
     "filp/whoops": "~2.0",
     "fzaninotto/faker": "~1.4",
@@ -53,6 +59,9 @@
     "symfony/css-selector": "4.0.*",
     "symfony/dom-crawler": "4.0.*"
   },
+  "suggest": {
+    "ext-mcrypt": "For upgrading from before v5.1 this is used to re-encrypt data"
+  },
   "extra": {
     "laravel": {
       "dont-discover": [
diff --git a/composer.lock b/composer.lock
index caf0ea961d..010224354e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3b6a6bea98c5876c05f1130cf7ad7e97",
+    "content-hash": "84e2cfa0d9406a810bd3ce6e0c2f3ffd",
     "packages": [
         {
             "name": "adldap2/adldap2",
@@ -6995,6 +6995,129 @@
             ],
             "time": "2018-11-09T08:37:55+00:00"
         },
+        {
+            "name": "barryvdh/laravel-ide-helper",
+            "version": "v2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
+                "reference": "725711022be71c6fa2e7bc8f9648bf125986f027"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/725711022be71c6fa2e7bc8f9648bf125986f027",
+                "reference": "725711022be71c6fa2e7bc8f9648bf125986f027",
+                "shasum": ""
+            },
+            "require": {
+                "barryvdh/reflection-docblock": "^2.0.6",
+                "composer/composer": "^1.6",
+                "illuminate/console": "^5.5,<5.9",
+                "illuminate/filesystem": "^5.5,<5.9",
+                "illuminate/support": "^5.5,<5.9",
+                "php": ">=7"
+            },
+            "require-dev": {
+                "doctrine/dbal": "~2.3",
+                "illuminate/config": "^5.1,<5.9",
+                "illuminate/view": "^5.1,<5.9",
+                "phpro/grumphp": "^0.14",
+                "phpunit/phpunit": "4.*",
+                "scrutinizer/ocular": "~1.1",
+                "squizlabs/php_codesniffer": "^3"
+            },
+            "suggest": {
+                "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Barryvdh\\LaravelIdeHelper\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.",
+            "keywords": [
+                "autocomplete",
+                "codeintel",
+                "helper",
+                "ide",
+                "laravel",
+                "netbeans",
+                "phpdoc",
+                "phpstorm",
+                "sublime"
+            ],
+            "time": "2019-03-05T09:24:51+00:00"
+        },
+        {
+            "name": "barryvdh/reflection-docblock",
+            "version": "v2.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
+                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16",
+                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0,<4.5"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Barryvdh": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2018-12-13T10:34:14+00:00"
+        },
         {
             "name": "behat/gherkin",
             "version": "v4.5.1",
@@ -7219,6 +7342,309 @@
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
             "time": "2018-07-26T11:55:37+00:00"
         },
+        {
+            "name": "composer/ca-bundle",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+                "psr/log": "^1.0",
+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\CaBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "ssl",
+                "tls"
+            ],
+            "time": "2019-01-28T09:30:10+00:00"
+        },
+        {
+            "name": "composer/composer",
+            "version": "1.8.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/composer.git",
+                "reference": "bc364c2480c17941e2135cfc568fa41794392534"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/composer/zipball/bc364c2480c17941e2135cfc568fa41794392534",
+                "reference": "bc364c2480c17941e2135cfc568fa41794392534",
+                "shasum": ""
+            },
+            "require": {
+                "composer/ca-bundle": "^1.0",
+                "composer/semver": "^1.0",
+                "composer/spdx-licenses": "^1.2",
+                "composer/xdebug-handler": "^1.1",
+                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+                "php": "^5.3.2 || ^7.0",
+                "psr/log": "^1.0",
+                "seld/jsonlint": "^1.4",
+                "seld/phar-utils": "^1.0",
+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
+            },
+            "conflict": {
+                "symfony/console": "2.8.38"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
+                "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
+                "ext-zlib": "Allow gzip compression of HTTP requests"
+            },
+            "bin": [
+                "bin/composer"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\": "src/Composer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.",
+            "homepage": "https://getcomposer.org/",
+            "keywords": [
+                "autoload",
+                "dependency",
+                "package"
+            ],
+            "time": "2019-02-11T09:52:10+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "time": "2016-08-30T16:08:34+00:00"
+        },
+        {
+            "name": "composer/spdx-licenses",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/spdx-licenses.git",
+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Spdx\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "SPDX licenses list and validation library.",
+            "keywords": [
+                "license",
+                "spdx",
+                "validator"
+            ],
+            "time": "2018-11-01T09:45:54+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
+                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "time": "2019-01-28T20:25:53+00:00"
+        },
         {
             "name": "facebook/webdriver",
             "version": "1.6.0",
@@ -7390,6 +7816,72 @@
             ],
             "time": "2018-07-12T10:23:15+00:00"
         },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "5.2.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~2.2.20",
+                "json-schema/json-schema-test-suite": "1.2.0",
+                "phpunit/phpunit": "^4.8.35"
+            },
+            "bin": [
+                "bin/validate-json"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JsonSchema\\": "src/JsonSchema/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2019-01-14T23:55:14+00:00"
+        },
         {
             "name": "maximebf/debugbar",
             "version": "v1.15.0",
@@ -7984,6 +8476,7 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2018-05-29T13:54:20+00:00"
         },
         {
@@ -8510,6 +9003,99 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2016-10-03T07:35:21+00:00"
         },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "time": "2018-01-24T12:46:19+00:00"
+        },
+        {
+            "name": "seld/phar-utils",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/phar-utils.git",
+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
+                "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Seld\\PharUtils\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "PHAR file format utilities, for when PHP phars you up",
+            "keywords": [
+                "phra"
+            ],
+            "time": "2015-10-13T18:44:15+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.3.2",
@@ -8675,6 +9261,56 @@
             "homepage": "https://symfony.com",
             "time": "2018-07-26T11:00:39+00:00"
         },
+        {
+            "name": "symfony/filesystem",
+            "version": "v4.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-02-07T11:40:08+00:00"
+        },
         {
             "name": "symfony/yaml",
             "version": "v4.2.1",
@@ -8783,7 +9419,12 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1.3"
+        "php": ">=7.1.3",
+        "ext-curl": "*",
+        "ext-fileinfo": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-pdo": "*"
     },
     "platform-dev": [],
     "platform-overrides": {