diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index a953676b8962..ebf091363f5d 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,6 +1,5 @@
 <?php namespace App\Exceptions;
 
-use Braintree\Util;
 use Illuminate\Support\Facades\Response;
 use Redirect;
 use Utils;
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index d8ebe79472d3..32f35727ec2c 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -10,7 +10,6 @@ use Redirect;
 use Cache;
 use App\Models\Client;
 use App\Models\Account;
-use App\Models\Contact;
 use App\Models\Invoice;
 use App\Models\Credit;
 use App\Models\Task;
diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php
index 0db08e555010..3c2179656dc0 100644
--- a/app/Http/Controllers/DashboardApiController.php
+++ b/app/Http/Controllers/DashboardApiController.php
@@ -1,7 +1,6 @@
 <?php namespace App\Http\Controllers;
 
 use Auth;
-use DB;
 use App\Ninja\Repositories\DashboardRepository;
 use App\Ninja\Transformers\ActivityTransformer;
 
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 1d5ccc888724..04aa8e2fb2fa 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -1,13 +1,9 @@
 <?php namespace App\Http\Controllers;
 
-use stdClass;
 use Auth;
-use DB;
 use View;
 use Utils;
 use App\Models\Client;
-use App\Models\Invoice;
-use App\Models\Payment;
 use App\Ninja\Repositories\DashboardRepository;
 
 /**
diff --git a/app/Http/Controllers/ExpenseCategoryApiController.php b/app/Http/Controllers/ExpenseCategoryApiController.php
index 1d7515ceed40..efd74c0dfcb3 100644
--- a/app/Http/Controllers/ExpenseCategoryApiController.php
+++ b/app/Http/Controllers/ExpenseCategoryApiController.php
@@ -1,9 +1,6 @@
 <?php namespace App\Http\Controllers;
 
-use View;
-use Utils;
 use Input;
-use Session;
 use App\Services\ExpenseCategoryService;
 use App\Http\Requests\CreateExpenseCategoryRequest;
 use App\Http\Requests\UpdateExpenseCategoryRequest;
diff --git a/app/Http/Controllers/ExpenseCategoryController.php b/app/Http/Controllers/ExpenseCategoryController.php
index 14e98bb3ac80..07fe898d8118 100644
--- a/app/Http/Controllers/ExpenseCategoryController.php
+++ b/app/Http/Controllers/ExpenseCategoryController.php
@@ -1,7 +1,6 @@
 <?php namespace App\Http\Controllers;
 
 use View;
-use Utils;
 use Input;
 use Session;
 use App\Services\ExpenseCategoryService;
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index a064e2787fb1..17b61c59d734 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -2,7 +2,6 @@
 
 use Auth;
 use View;
-use Utils;
 use Input;
 use Session;
 use App\Models\Client;
diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php
index ed73fbe8585a..95aa97a1fcdc 100644
--- a/app/Http/Controllers/RecurringInvoiceController.php
+++ b/app/Http/Controllers/RecurringInvoiceController.php
@@ -1,6 +1,5 @@
 <?php namespace App\Http\Controllers;
 
-use Utils;
 use App\Ninja\Repositories\InvoiceRepository;
 use App\Ninja\Datatables\RecurringInvoiceDatatable;
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index f23da88bd489..57c49d077d55 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -1,11 +1,8 @@
 <?php namespace App\Http\Controllers;
 
 use Auth;
-use Config;
 use Input;
 use Utils;
-use DB;
-use Session;
 use Str;
 use View;
 use App\Models\Account;
diff --git a/app/Http/ViewComposers/ClientPortalHeaderComposer.php b/app/Http/ViewComposers/ClientPortalHeaderComposer.php
index 3b85704a19b6..9db94446895c 100644
--- a/app/Http/ViewComposers/ClientPortalHeaderComposer.php
+++ b/app/Http/ViewComposers/ClientPortalHeaderComposer.php
@@ -3,7 +3,6 @@
 namespace App\Http\ViewComposers;
 
 use DB;
-use Cache;
 use Illuminate\View\View;
 use App\Models\Contact;
 
diff --git a/app/Jobs/SendInvoiceEmail.php b/app/Jobs/SendInvoiceEmail.php
index 8194a1c95684..073c74356a8c 100644
--- a/app/Jobs/SendInvoiceEmail.php
+++ b/app/Jobs/SendInvoiceEmail.php
@@ -8,7 +8,6 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Monolog\Logger;
-use Carbon;
 
 /**
  * Class SendInvoiceEmail
diff --git a/app/Jobs/SendNotificationEmail.php b/app/Jobs/SendNotificationEmail.php
index 73c29f66a984..cb62295f4c67 100644
--- a/app/Jobs/SendNotificationEmail.php
+++ b/app/Jobs/SendNotificationEmail.php
@@ -7,8 +7,6 @@ use App\Ninja\Mailers\UserMailer;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Monolog\Logger;
-use Carbon;
 
 /**
  * Class SendInvoiceEmail
diff --git a/app/Jobs/SendPaymentEmail.php b/app/Jobs/SendPaymentEmail.php
index 300b977f1017..27bd08f8063c 100644
--- a/app/Jobs/SendPaymentEmail.php
+++ b/app/Jobs/SendPaymentEmail.php
@@ -7,8 +7,6 @@ use App\Ninja\Mailers\ContactMailer;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Monolog\Logger;
-use Carbon;
 
 /**
  * Class SendInvoiceEmail
diff --git a/app/Jobs/SendPushNotification.php b/app/Jobs/SendPushNotification.php
index 5a60b77406b5..fe1ba74d9a1b 100644
--- a/app/Jobs/SendPushNotification.php
+++ b/app/Jobs/SendPushNotification.php
@@ -7,8 +7,6 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use App\Services\PushService;
-use Monolog\Logger;
-use Carbon;
 
 /**
  * Class SendInvoiceEmail
diff --git a/app/Libraries/DateUtils.php b/app/Libraries/DateUtils.php
index bb8548a3d67e..8057b2fe29f7 100644
--- a/app/Libraries/DateUtils.php
+++ b/app/Libraries/DateUtils.php
@@ -1,7 +1,5 @@
 <?php namespace App\Libraries;
 
-use DateTime;
-
 class DateUtils
 {
 }
diff --git a/app/Libraries/HistoryUtils.php b/app/Libraries/HistoryUtils.php
index ea6ad4134325..9df748211640 100644
--- a/app/Libraries/HistoryUtils.php
+++ b/app/Libraries/HistoryUtils.php
@@ -1,6 +1,5 @@
 <?php namespace App\Libraries;
 
-use Request;
 use stdClass;
 use Session;
 use App\Models\EntityModel;
diff --git a/app/Listeners/CreditListener.php b/app/Listeners/CreditListener.php
index 2ad809cd24d7..8591c79445e5 100644
--- a/app/Listeners/CreditListener.php
+++ b/app/Listeners/CreditListener.php
@@ -3,7 +3,6 @@
 use Carbon;
 use App\Models\Credit;
 use App\Events\PaymentWasDeleted;
-use App\Events\PaymentWasRefunded;
 use App\Ninja\Repositories\CreditRepository;
 
 /**
diff --git a/app/Models/AccountGatewaySettings.php b/app/Models/AccountGatewaySettings.php
index 6b95c585c0a4..6dcc13c8e381 100644
--- a/app/Models/AccountGatewaySettings.php
+++ b/app/Models/AccountGatewaySettings.php
@@ -1,7 +1,5 @@
 <?php namespace App\Models;
 
-use Auth;
-
 /**
  * Class AccountGatewaySettings
  */
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index a7f116bc18be..8c31fb47254c 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -2,7 +2,6 @@
 
 use Auth;
 use Eloquent;
-use Illuminate\Database\QueryException;
 use Utils;
 use Validator;
 
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index a170bba07e18..d0b52bcb4929 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -5,7 +5,6 @@ use Laracasts\Presenter\PresentableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Events\ExpenseWasCreated;
 use App\Events\ExpenseWasUpdated;
-use App\Events\ExpenseWasDeleted;
 
 /**
  * Class Expense
diff --git a/app/Ninja/Datatables/AccountGatewayDatatable.php b/app/Ninja/Datatables/AccountGatewayDatatable.php
index e86ef3ac7496..eb1ad9e19281 100644
--- a/app/Ninja/Datatables/AccountGatewayDatatable.php
+++ b/app/Ninja/Datatables/AccountGatewayDatatable.php
@@ -5,7 +5,6 @@ use App\Models\GatewayType;
 use URL;
 use Cache;
 use Utils;
-use Session;
 use App\Models\AccountGateway;
 
 class AccountGatewayDatatable extends EntityDatatable
diff --git a/app/Ninja/Datatables/ExpenseCategoryDatatable.php b/app/Ninja/Datatables/ExpenseCategoryDatatable.php
index f5d4a7b5540f..741872c02c53 100644
--- a/app/Ninja/Datatables/ExpenseCategoryDatatable.php
+++ b/app/Ninja/Datatables/ExpenseCategoryDatatable.php
@@ -1,6 +1,5 @@
 <?php namespace App\Ninja\Datatables;
 
-use Utils;
 use URL;
 use Auth;
 
diff --git a/app/Ninja/Import/BaseTransformer.php b/app/Ninja/Import/BaseTransformer.php
index 8c6f316d265f..579e2d62571f 100644
--- a/app/Ninja/Import/BaseTransformer.php
+++ b/app/Ninja/Import/BaseTransformer.php
@@ -2,7 +2,6 @@
 
 use Carbon;
 use Utils;
-use DateTime;
 use League\Fractal\TransformerAbstract;
 
 /**
diff --git a/app/Ninja/Import/CSV/ExpenseTransformer.php b/app/Ninja/Import/CSV/ExpenseTransformer.php
index 4b8a4cef64ff..6256392e833c 100644
--- a/app/Ninja/Import/CSV/ExpenseTransformer.php
+++ b/app/Ninja/Import/CSV/ExpenseTransformer.php
@@ -1,6 +1,5 @@
 <?php namespace App\Ninja\Import\CSV;
 
-use Utils;
 use App\Ninja\Import\BaseTransformer;
 use League\Fractal\Resource\Item;
 
diff --git a/app/Ninja/Intents/BaseIntent.php b/app/Ninja/Intents/BaseIntent.php
index 4db4fa442050..b14b21f801b7 100644
--- a/app/Ninja/Intents/BaseIntent.php
+++ b/app/Ninja/Intents/BaseIntent.php
@@ -2,7 +2,6 @@
 
 use stdClass;
 use Exception;
-use App\Libraries\CurlUtils;
 use App\Libraries\Skype\SkypeResponse;
 
 class BaseIntent
diff --git a/app/Ninja/Intents/DownloadInvoiceIntent.php b/app/Ninja/Intents/DownloadInvoiceIntent.php
index 400519155ff4..d28ebb89fcec 100644
--- a/app/Ninja/Intents/DownloadInvoiceIntent.php
+++ b/app/Ninja/Intents/DownloadInvoiceIntent.php
@@ -1,7 +1,5 @@
 <?php namespace App\Ninja\Intents;
 
-use Auth;
-use App\Models\EntityModel;
 use App\Models\Invoice;
 use App\Libraries\Skype\SkypeResponse;
 
diff --git a/app/Ninja/Intents/EmailInvoiceIntent.php b/app/Ninja/Intents/EmailInvoiceIntent.php
index 64a26c590367..3f39e1ad90ff 100644
--- a/app/Ninja/Intents/EmailInvoiceIntent.php
+++ b/app/Ninja/Intents/EmailInvoiceIntent.php
@@ -2,8 +2,6 @@
 
 use Auth;
 use Exception;
-use App\Models\EntityModel;
-use App\Models\Invoice;
 use App\Libraries\Skype\SkypeResponse;
 
 class EmailInvoiceIntent extends InvoiceIntent
diff --git a/app/Ninja/Intents/ListProductsIntent.php b/app/Ninja/Intents/ListProductsIntent.php
index a8a5d302b083..de274566a593 100644
--- a/app/Ninja/Intents/ListProductsIntent.php
+++ b/app/Ninja/Intents/ListProductsIntent.php
@@ -1,7 +1,6 @@
 <?php namespace App\Ninja\Intents;
 
 use Auth;
-use Exception;
 use App\Models\Product;
 
 class ListProductsIntent extends ProductIntent
diff --git a/app/Ninja/Intents/ProductIntent.php b/app/Ninja/Intents/ProductIntent.php
index 15ebc67298d4..73d07e7c7b90 100644
--- a/app/Ninja/Intents/ProductIntent.php
+++ b/app/Ninja/Intents/ProductIntent.php
@@ -1,8 +1,5 @@
 <?php namespace App\Ninja\Intents;
 
-use Auth;
-use Exception;
-
 class ProductIntent extends BaseIntent
 {
     public function __construct($state, $data)
diff --git a/app/Ninja/Reports/TaskReport.php b/app/Ninja/Reports/TaskReport.php
index 4d7b7398b7ce..f4e9e37f7cca 100644
--- a/app/Ninja/Reports/TaskReport.php
+++ b/app/Ninja/Reports/TaskReport.php
@@ -2,7 +2,6 @@
 
 namespace App\Ninja\Reports;
 
-use Auth;
 use Utils;
 use App\Models\Task;
 
diff --git a/app/Ninja/Repositories/ExpenseCategoryRepository.php b/app/Ninja/Repositories/ExpenseCategoryRepository.php
index 14409a8aefe6..5242784b5034 100644
--- a/app/Ninja/Repositories/ExpenseCategoryRepository.php
+++ b/app/Ninja/Repositories/ExpenseCategoryRepository.php
@@ -1,7 +1,6 @@
 <?php namespace App\Ninja\Repositories;
 
 use DB;
-use Utils;
 use Auth;
 use App\Models\ExpenseCategory;
 
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index e22042b91c63..11c1b4622424 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -4,7 +4,6 @@ use App\Models\Account;
 use DB;
 use Utils;
 use Auth;
-use Carbon;
 use App\Models\Client;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
diff --git a/app/Ninja/Repositories/ProjectRepository.php b/app/Ninja/Repositories/ProjectRepository.php
index 838057c7c2d1..a5d2cb616f27 100644
--- a/app/Ninja/Repositories/ProjectRepository.php
+++ b/app/Ninja/Repositories/ProjectRepository.php
@@ -1,7 +1,6 @@
 <?php namespace App\Ninja\Repositories;
 
 use DB;
-use Utils;
 use Auth;
 use App\Models\Project;
 
diff --git a/app/Ninja/Repositories/TokenRepository.php b/app/Ninja/Repositories/TokenRepository.php
index 42b304bcf23e..676c4d07f57d 100644
--- a/app/Ninja/Repositories/TokenRepository.php
+++ b/app/Ninja/Repositories/TokenRepository.php
@@ -1,7 +1,6 @@
 <?php namespace App\Ninja\Repositories;
 
 use DB;
-use Session;
 use App\Models\Token;
 
 class TokenRepository extends BaseRepository
diff --git a/app/Ninja/Repositories/UserRepository.php b/app/Ninja/Repositories/UserRepository.php
index 0d634aaed99b..658d9bd4e871 100644
--- a/app/Ninja/Repositories/UserRepository.php
+++ b/app/Ninja/Repositories/UserRepository.php
@@ -1,8 +1,6 @@
 <?php namespace App\Ninja\Repositories;
 
 use DB;
-use Session;
-use App\Models\User;
 
 class UserRepository extends BaseRepository
 {
diff --git a/app/Policies/ProductPolicy.php b/app/Policies/ProductPolicy.php
index 7cabfeec80e9..bf3c96472ba8 100644
--- a/app/Policies/ProductPolicy.php
+++ b/app/Policies/ProductPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Models\User;
-
 /**
  * Class ProductPolicy
  */
diff --git a/app/Policies/ProjectPolicy.php b/app/Policies/ProjectPolicy.php
index 813ba4913ed3..9f8ddd666d36 100644
--- a/app/Policies/ProjectPolicy.php
+++ b/app/Policies/ProjectPolicy.php
@@ -2,8 +2,6 @@
 
 namespace App\Policies;
 
-use App\Models\User;
-
 class ProjectPolicy extends EntityPolicy
 {
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 4b68229e9f93..8c6989923e29 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,6 +1,5 @@
 <?php namespace App\Providers;
 
-use Auth;
 use Utils;
 use Form;
 use URL;
diff --git a/app/Services/ExpenseCategoryService.php b/app/Services/ExpenseCategoryService.php
index e0b8f3cffa77..62708e3820f9 100644
--- a/app/Services/ExpenseCategoryService.php
+++ b/app/Services/ExpenseCategoryService.php
@@ -1,7 +1,5 @@
 <?php namespace App\Services;
 
-use Utils;
-use Auth;
 use App\Ninja\Repositories\ExpenseCategoryRepository;
 use App\Ninja\Datatables\ExpenseCategoryDatatable;
 
diff --git a/app/Services/ExpenseService.php b/app/Services/ExpenseService.php
index fc71ab2eee9b..efb10a5e7289 100644
--- a/app/Services/ExpenseService.php
+++ b/app/Services/ExpenseService.php
@@ -5,7 +5,6 @@ use Utils;
 use App\Ninja\Repositories\ExpenseRepository;
 use App\Models\Client;
 use App\Models\Vendor;
-use App\Models\ExpenseCategory;
 use App\Ninja\Datatables\ExpenseDatatable;
 
 /**
diff --git a/app/Services/ProjectService.php b/app/Services/ProjectService.php
index 0e479475bddc..368631592ac8 100644
--- a/app/Services/ProjectService.php
+++ b/app/Services/ProjectService.php
@@ -1,7 +1,5 @@
 <?php namespace App\Services;
 
-use Utils;
-use Auth;
 use App\Models\Client;
 use App\Ninja\Repositories\ProjectRepository;
 use App\Ninja\Datatables\ProjectDatatable;