diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php
index 08666ad1f4a5..9716e558980f 100644
--- a/app/Services/Invoice/AddGatewayFee.php
+++ b/app/Services/Invoice/AddGatewayFee.php
@@ -52,7 +52,6 @@ class AddGatewayFee extends AbstractService
         $invoice_items = collect($invoice_items)->filter(function ($item) {
             return $item->type_id != '3';
         });
-        // })->toArray();
 
         $this->invoice->line_items = $invoice_items;
 
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 7aad51649f2b..c039078fc620 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -414,10 +414,9 @@ class InvoiceService
                                      })->toArray();
 
         $this->invoice->line_items = array_values($items);
-        
+
         $this->invoice = $this->invoice->calc()->getInvoice();
-        // $this->deletePdf();
-        $this->deleteEInvoice();
+        $this->deleteEInvoice(); //@deprecated
 
         /* 24-03-2022 */
         $new_balance = $this->invoice->balance;
diff --git a/resources/views/portal/ninja2020/gateways/gocardless/sepa/pay.blade.php b/resources/views/portal/ninja2020/gateways/gocardless/sepa/pay.blade.php
index 25b3c6a870fc..0732dcad478e 100644
--- a/resources/views/portal/ninja2020/gateways/gocardless/sepa/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/gocardless/sepa/pay.blade.php
@@ -38,7 +38,9 @@
         @endcomponent
     @endif
 
-    @include('portal.ninja2020.gateways.includes.pay_now')
+    @if (count($tokens) > 0)
+        @include('portal.ninja2020.gateways.includes.pay_now')
+    @endif
 @endsection
 
 @push('footer')
diff --git a/tests/Unit/LateFeeTest.php b/tests/Unit/LateFeeTest.php
index caa9c953422c..b89fa0ff13d5 100644
--- a/tests/Unit/LateFeeTest.php
+++ b/tests/Unit/LateFeeTest.php
@@ -177,7 +177,6 @@ class LateFeeTest extends TestCase
         });
 
         $invoices = Invoice::whereIn('id', $ids)->cursor()->map(function ($invoice){
-            nlog("line item count = ".count($invoice->line_items));
             $this->assertGreaterThan(0, count($invoice->line_items));
             
             $invoice->service()->removeUnpaidGatewayFees();
@@ -188,7 +187,6 @@ class LateFeeTest extends TestCase
         });
 
         $invoices->each(function ($invoice) {
-            nlog($invoice->line_items);
             $this->assertGreaterThan(0, count($invoice->line_items));
         });