diff --git a/config/services.yaml b/config/services.yaml
index 07354a8a..7d585e08 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -196,12 +196,6 @@ services:
             $upload_dir: "%jo_extra_upload_directory%" 
 
     App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler"
-
-    # warranty handler service
-    App\Service\WarrantyHandler\CMBWarrantyHandler: ~
-    
-    # warranty handler interface
-    App\Service\WarrantyHandlerInterface: "@App\\Service\\WarrantyHandler\\CMBWarrantyHandler"
     
     # map manager
     #App\Service\GISManager\Bing: ~
diff --git a/src/Ramcar/CMBWarrantyClass.php b/src/Ramcar/CMBWarrantyClass.php
index b3fbfc5c..1e2c69b4 100644
--- a/src/Ramcar/CMBWarrantyClass.php
+++ b/src/Ramcar/CMBWarrantyClass.php
@@ -4,14 +4,12 @@ namespace App\Ramcar;
 
 class CMBWarrantyClass extends NameValue
 {
-    const WTY_PASSENGER  = 'passenger';
-    const WTY_COMMERCIAL = 'commercial';
-    const WTY_GRAB       = 'grab';   
+    const WTY_PASSENGER    = 'passenger';
+    const WTY_COMMERCIAL  = 'commercial';
 
     const COLLECTION = [
         'passenger' => 'Passenger',
         'commercial' => 'Commercial',
-        'grab' => 'Grab',
     ];
 
 }
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 4760d286..05d9ce45 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -44,7 +44,7 @@ use App\Service\InvoiceGeneratorInterface;
 use App\Service\JobOrderHandlerInterface;
 use App\Service\RiderAssignmentHandlerInterface;
 use App\Service\CustomerHandlerInterface;
-use App\Service\WarrantyHandlerInterface;
+use App\Service\WarrantyHandler;
 use App\Service\MQTTClient;
 use App\Service\APNSClient;
 use App\Service\MapTools;
@@ -75,7 +75,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
     public function __construct(Security $security, EntityManagerInterface $em, 
                                 InvoiceGeneratorInterface $ic, ValidatorInterface $validator,
                                 TranslatorInterface $translator, RiderAssignmentHandlerInterface $rah,
-                                string $country_code, WarrantyHandlerInterface $wh,
+                                string $country_code, WarrantyHandler $wh,
                                 CustomerHandlerInterface $cust_handler)
     {
         $this->em = $em;
diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index 6fc80932..72c6f949 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -20,7 +20,7 @@ use App\Service\RiderAPIHandlerInterface;
 use App\Service\RedisClientProvider;
 use App\Service\RiderCache;
 use App\Service\MQTTClient;
-use App\Service\WarrantyHandlerInterface;
+use App\Service\WarrantyHandler;
 use App\Service\JobOrderHandlerInterface;
 use App\Service\InvoiceGeneratorInterface;
 use App\Service\RiderTracker;
@@ -61,7 +61,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
     public function __construct(EntityManagerInterface $em, RedisClientProvider $redis,
                                 EncoderFactoryInterface $ef, RiderCache $rcache,
                                 string $country_code, MQTTClient $mclient,
-                                WarrantyHandlerInterface $wh, JobOrderHandlerInterface $jo_handler,
+                                WarrantyHandler $wh, JobOrderHandlerInterface $jo_handler,
                                 InvoiceGeneratorInterface $ic, string $upload_dir,
                                 RiderTracker $rider_tracker, NotificationManager $nm,
                                 UrlGeneratorInterface $router)
diff --git a/src/Service/WarrantyHandlerInterface.php b/src/Service/WarrantyHandlerInterface.php
deleted file mode 100644
index 13950ed5..00000000
--- a/src/Service/WarrantyHandlerInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Entity\Warranty;
-
-use DateTime;
-
-interface WarrantyHandlerInterface
-{
-    public function createWarranty(string $serial, string $plate_number, string $first_name, string$last_name, 
-                                   string $mobile_number, array $batt_list, DateTime $date_purchase, 
-                                   string $warranty_class);
-
-    public function updateCustomerVehicle(string $serial, array $batteries, string $plate_number, DateTime $date_expire);
-
-    public function updateWarranty(Warranty $warr, string $first_name, string $last_name, string $mobile_number, 
-                                   array $batt_list, DateTime $date_purchase);
-
-    public function computeDateExpire(DateTime $date_create, int $warranty_period);
-
-    public function getWarrantyPeriod(array $batteries, string $warranty_class);
-
-    public function getBatteriesForWarranty(Warranty $warr);
-
-    public function cleanPlateNumber(string $plate);
-}