diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 39f9808cbe..c273b87a59 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -463,8 +463,8 @@ class CheckData extends Command
                             $contact = $contact_class::where('company_id', $entity->company_id)->where($client_vendor_key,$entity->{$client_vendor_key})->first();
 
                             //double check if an archived invite exists
-                            if($contact && $entity->invitations()->withTrashed()->where($contact_id, $contact->id)->count() != 0) {
-                                $i = $entity->invitations()->withTrashed()->where($contact_id, $contact->id)->first();
+                            if($contact && $entity_obj::withTrashed()->where($entity_key, $entity->id)->where($contact_id, $contact->id)->count() != 0) {
+                                $i = $entity_obj::withTrashed()->where($entity_key, $entity->id)->where($contact_id, $contact->id)->first();
                                 $i->restore();
                                 $this->logMessage("Found a valid contact and invitation restoring for {$entity_key} - {$entity->id}");
                             }
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 3e237ac824..6c12b1c1ec 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Invoice Ninja (https://entityninja.com).
  *
@@ -65,6 +64,8 @@ class CreateEntityPdf implements ShouldQueue
 
     public $client;
 
+    public $deleteWhenMissingModels = true;
+
     /**
      * Create a new job instance.
      *
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 553cfeae3b..ceb8d107e0 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -19,27 +19,21 @@ use App\Jobs\Mail\NinjaMailerObject;
 use App\Jobs\Util\SystemLogger;
 use App\Libraries\Google\Google;
 use App\Libraries\MultiDB;
-use App\Mail\TemplateEmail;
 use App\Models\ClientContact;
 use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\SystemLog;
 use App\Models\User;
-use App\Providers\MailServiceProvider;
 use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
-use Dacastro4\LaravelGmail\Facade\LaravelGmail;
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Mail\Mailer;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Mail;
 use Turbo124\Beacon\Facades\LightLogs;
 use Illuminate\Support\Facades\Cache;