diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index c273b87a597b..fa74167ae275 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -175,8 +175,6 @@ class CheckData extends Command
 
         });
 
-
-
     }
 
     private function checkOauthSanity()
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index db657097c02c..7c02d2f37924 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -291,11 +291,11 @@ class LoginController extends BaseController
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
         }
 
-        $cu->first()->account->companies->each(function ($company) use ($cu, $request) {
-            if ($company->tokens()->where('is_system', true)->count() == 0) {
-                (new CreateCompanyToken($company, $cu->first()->user, $request->server('HTTP_USER_AGENT')))->handle();
-            }
-        });
+        // $cu->first()->account->companies->each(function ($company) use ($cu, $request) {
+        //     if ($company->tokens()->where('is_system', true)->count() == 0) {
+        //         (new CreateCompanyToken($company, $cu->first()->user, $request->server('HTTP_USER_AGENT')))->handle();
+        //     }
+        // });
 
         if ($request->has('current_company') && $request->input('current_company') == 'true') {
             $cu->where('company_id', $company_token->company_id);
@@ -480,13 +480,13 @@ class LoginController extends BaseController
             return $cu;
         }
 
-        if (auth()->user()->company_users()->count() != auth()->user()->tokens()->distinct('company_id')->count()) {
-            auth()->user()->companies->each(function ($company) {
-                if (!CompanyToken::where('user_id', auth()->user()->id)->where('company_id', $company->id)->exists()) {
-                    (new CreateCompanyToken($company, auth()->user(), 'Google_O_Auth'))->handle();
-                }
-            });
-        }
+        // if (auth()->user()->company_users()->count() != auth()->user()->tokens()->distinct('company_id')->count()) {
+        //     auth()->user()->companies->each(function ($company) {
+        //         if (!CompanyToken::where('user_id', auth()->user()->id)->where('company_id', $company->id)->exists()) {
+        //             (new CreateCompanyToken($company, auth()->user(), 'Google_O_Auth'))->handle();
+        //         }
+        //     });
+        // }
 
         $truth->setCompanyToken(CompanyToken::where('user_id', auth()->user()->id)->where('company_id', $set_company->id)->first());
 
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index fa88269d8f54..c7f6db9b8615 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -633,7 +633,7 @@ class BaseController extends Controller
     {
         $user = auth()->user();
 
-        if ($user->getCompany()->is_large || $this->complexPermissionsUser()) {
+        if ($user->getCompany()->is_large) {
             $this->manager->parseIncludes($this->mini_load);
 
             return $this->miniLoadResponse($query);
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index d208afed67f2..c416b1eb798e 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -115,6 +115,7 @@ class CreateAccount
 
         $spafe62e = isset($this->request['token_name']) ? $this->request['token_name'] : request()->server('HTTP_USER_AGENT');
         $sp2d97e8 = (new CreateCompanyToken($sp035a66, $spaa9f78, $spafe62e))->handle();
+        
         if ($spaa9f78) {
             event(new AccountCreated($spaa9f78, $sp035a66, Ninja::eventVars()));
         }
diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index ceaf205621cd..d83e5f1bba2a 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -43,7 +43,7 @@ class CompanySizeCheck implements ShouldQueue
     {
         if (! config('ninja.db.multi_db_enabled')) {
             
-            Company::where('is_large', false)->withCount(['invoices', 'clients', 'products'])->cursor()->each(function ($company) {
+            Company::where('is_large', false)->withCount(['invoices', 'clients', 'products', 'quotes'])->cursor()->each(function ($company) {
                 if ($company->invoices_count > 500 || $company->products_count > 500 || $company->clients_count > 500) {
                     nlog("Marking company {$company->id} as large");
 
@@ -69,8 +69,8 @@ class CompanySizeCheck implements ShouldQueue
 
                 nlog("Company size check db {$db}");
 
-                Company::where('is_large', false)->withCount(['invoices', 'clients', 'products'])->cursor()->each(function ($company) {
-                    if ($company->invoices_count > 500 || $company->products_count > 500 || $company->clients_count > 500) {
+                Company::where('is_large', false)->withCount(['invoices', 'clients', 'products', 'quotes'])->cursor()->each(function ($company) {
+                    if ($company->invoices_count > 500 || $company->products_count > 500 || $company->clients_count > 500 || $company->quotes_count > 500) {
                         nlog("Marking company {$company->id} as large");
 
                         $company->account->companies()->update(['is_large' => true]);
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 8bccbd976280..2835eed92fff 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -79,7 +79,6 @@ class CreateUser
             'is_locked' => 0,
             'permissions' => '',
             'notifications' => CompanySettings::notificationDefaults(),
-            //'settings' => DefaultSettings::userSettings(),
             'settings' => null,
         ]);
 
diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index bc8772dd7bc3..88f7bbb83df4 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -40,7 +40,6 @@ class TaskStatusRepository extends BaseRepository
 
 	public function archive($task_status)
 	{
-
         $task_status = TaskStatus::where('id', $task_status->id)
                                  ->where('company_id', $task_status->company_id)
                                  ->first();