diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php
index fdaceae88cc2..31c144d2f232 100644
--- a/app/Export/CSV/InvoiceItemExport.php
+++ b/app/Export/CSV/InvoiceItemExport.php
@@ -147,7 +147,12 @@ class InvoiceItemExport extends BaseExport
                 if(str_contains($key, "item.")){
 
                     $key = str_replace("item.", "", $key);
-                    $item_array[$key] = $item->{$key};
+
+                    if(property_exists($item, $key))
+                        $item_array[$key] = $item->{$key};
+                    else
+                        $item_array[$key] = '';
+                    
                 }
 
             }
diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index c50868b85c42..e64d11025d5f 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -180,6 +180,7 @@ class MigrationController extends BaseController
         $company->vendors()->forceDelete();
         $company->expenses()->forceDelete();
         $company->purchase_orders()->forceDelete();
+        $company->all_activities()->forceDelete();
 
         $settings = $company->settings;
 
diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 6ce29bbaaf24..2207fbbd6407 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -469,6 +469,7 @@ class CompanyImport implements ShouldQueue
     private function purgeCompanyData()
     {
         $this->company->clients()->forceDelete();
+        $this->company->all_activities()->forceDelete();
         $this->company->products()->forceDelete();
         $this->company->projects()->forceDelete();
         $this->company->tasks()->forceDelete();
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 5fc15f2a6d36..68c5ef318d59 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -301,11 +301,6 @@ class CompanyGateway extends BaseModel
 
         $fee = $this->calcGatewayFee($amount, $gateway_type_id);
 
-        // if ($fee > 0) {
-        //     $fee =  Number::formatMoney(round($fee, 2), $client);
-        //     $label = ' - '.$fee.' '.ctrans('texts.fee');
-        // }
-
         if($fee > 0) {
 
             $fees_and_limits = $this->fees_and_limits->{$gateway_type_id};