diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index ae6cb838..27631d7f 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -857,29 +857,25 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 else
                     $date_purchase = $obj->getDateFulfill();
 
-                // validate plate number
-                // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
-                $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
-                if ($plate_number != false)
+                $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
+
+                $batt_list = array();
+                $invoice = $obj->getInvoice();
+                if (!empty($invoice))
                 {
-                    $batt_list = array();
-                    $invoice = $obj->getInvoice();
-                    if (!empty($invoice))
+                    // get battery
+                    $invoice_items = $invoice->getItems();
+                    foreach ($invoice_items as $item)
                     {
-                        // get battery
-                        $invoice_items = $invoice->getItems();
-                        foreach ($invoice_items as $item)
+                        $battery = $item->getBattery();
+                        if ($battery != null)
                         {
-                            $battery = $item->getBattery();
-                            if ($battery != null)
-                            {
-                                $batt_list[] = $item->getBattery();
-                            }
+                            $batt_list[] = $item->getBattery();
                         }
                     }
-
-                    $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
                 }
+
+                $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
             }
         }
     }
@@ -2201,6 +2197,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         return null;
     }
 
+<<<<<<< HEAD
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 94067844..105a98ac 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -723,30 +723,27 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                 else
                     $date_purchase = $obj->getDateFulfill();
 
-                // validate plate number
-                // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
-                $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
-                if ($plate_number != false)
+                $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
+
+                $batt_list = array();
+                $invoice = $obj->getInvoice();
+                if (!empty($invoice))
                 {
-                    $batt_list = array();
-                    $invoice = $obj->getInvoice();
-                    if (!empty($invoice))
+                    // get battery
+                    $invoice_items = $invoice->getItems();
+                    foreach ($invoice_items as $item)
                     {
-                        // get battery
-                        $invoice_items = $invoice->getItems();
-                        foreach ($invoice_items as $item)
+                        $battery = $item->getBattery();
+                        if ($battery != null)
                         {
-                            $battery = $item->getBattery();
-                            if ($battery != null)
-                            {
-                                $batt_list[] = $item->getBattery();
-                            }
+                            $batt_list[] = $item->getBattery();
                         }
                     }
-
-                    $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
                 }
+
+                $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
             }
+
         }
     }
 
diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index fa416e27..cf96181d 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -30,7 +30,6 @@ use App\Entity\Promo;
 use App\Entity\Battery;
 use App\Entity\BatteryModel;
 use App\Entity\BatterySize;
-use App\Entity\Warranty;
 
 use DateTime;
 
@@ -538,29 +537,25 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
             else
                 $date_purchase = $jo->getDateFulfill();
 
-            // validate plate number
-            // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
-            $plate_number = Warranty::cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
-            if ($plate_number != false)
+            $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
+
+            $batt_list = array();
+            $invoice = $jo->getInvoice();
+            if (!empty($invoice))
             {
-                $batt_list = array();
-                $invoice = $jo->getInvoice();
-                if (!empty($invoice))
+                // get battery
+                $invoice_items = $invoice->getItems();
+                foreach ($invoice_items as $item)
                 {
-                    // get battery
-                    $invoice_items = $invoice->getItems();
-                    foreach ($invoice_items as $item)
+                    $battery = $item->getBattery();
+                    if ($battery != null)
                     {
-                        $battery = $item->getBattery();
-                        if ($battery != null)
-                        {
-                            $batt_list[] = $item->getBattery();
-                        }
+                        $batt_list[] = $item->getBattery();
                     }
                 }
-
-                $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
             }
+
+            $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
         }
 
         // send mqtt event (fulfilled)