diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index ed60c7ac..8484ac8d 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -822,8 +822,4 @@ class JobOrder
         return $this->meta[$id];
     }
 
-    public function getAllMeta()
-    {
-        return $this->meta;
-    }
 }
diff --git a/src/Service/InvoiceGenerator/CMBInvoiceGenerator.php b/src/Service/InvoiceGenerator/CMBInvoiceGenerator.php
index 180f7d1f..cc1cb020 100644
--- a/src/Service/InvoiceGenerator/CMBInvoiceGenerator.php
+++ b/src/Service/InvoiceGenerator/CMBInvoiceGenerator.php
@@ -162,18 +162,14 @@ class CMBInvoiceGenerator implements InvoiceGeneratorInterface
         }
 
         // get the meta for service charges
-        if (array_key_exists('service_charges', $jo->getAllMeta()))
+        $service_charges = $jo->getMeta('service_charges');
+        if (!empty($service_charges))
         {
             $service_charges = $jo->getMeta('service_charges');
-            if ($service_charges != null)
-            {
-                $service_charges = $jo->getMeta('service_charges');
 
-                $this->invoiceServiceCharges($criteria, $service_charges);
-            }
+            $this->invoiceServiceCharges($criteria, $service_charges);
         }
 
-
         if ($ierror)
         {
             $error_array['invoice'] = $ierror;
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index bcef0c59..67880513 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -563,11 +563,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setRider($rider);
 
             $jo->addMeta('discount', $discount);
-
-            if (!empty($service_charges))
-            {
-                $jo->addMeta('service_charges', $service_charges);
-            }
+            $jo->addMeta('service_charges', $service_charges);
 
             // check if user is null, meaning call to create came from API
             if ($user != null)