diff --git a/config/auth.php b/config/auth.php
index cd086cdb3..a6d4148b5 100755
--- a/config/auth.php
+++ b/config/auth.php
@@ -28,7 +28,7 @@ return [
         ],
 
         'admin-api' => [
-            'driver' => 'token',
+            'driver' => 'jwt',
             'provider' => 'admins',
         ]
     ],
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index 05ab1b8cd..5ae13ffaa 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -162,24 +162,20 @@ class ExchangeRateController extends Controller
     {
         $exchangeRate = $this->exchangeRateRepository->findOrFail($id);
 
-        if ($this->exchangeRateRepository->count() == 1) {
-            session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error'));
-        } else {
-            try {
-                Event::dispatch('core.exchange_rate.delete.before', $id);
+        try {
+            Event::dispatch('core.exchange_rate.delete.before', $id);
 
-                $this->exchangeRateRepository->delete($id);
+            $this->exchangeRateRepository->delete($id);
 
-                session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success'));
+            session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success'));
 
-                Event::dispatch('core.exchange_rate.delete.after', $id);
+            Event::dispatch('core.exchange_rate.delete.after', $id);
 
-                return response()->json(['message' => true], 200);
-            } catch (\Exception $e) {
-                report($e);
-                
-                session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
-            }
+            return response()->json(['message' => true], 200);
+        } catch (\Exception $e) {
+            report($e);
+            
+            session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
         }
 
         return response()->json(['message' => false], 400);
diff --git a/packages/Webkul/Tax/src/Models/TaxRate.php b/packages/Webkul/Tax/src/Models/TaxRate.php
index 8a845bf7d..404d4a154 100755
--- a/packages/Webkul/Tax/src/Models/TaxRate.php
+++ b/packages/Webkul/Tax/src/Models/TaxRate.php
@@ -20,7 +20,6 @@ class TaxRate extends Model implements TaxRateContract
         'identifier',
         'is_zip',
         'zip_code',
-        'zip_code',
         'zip_from',
         'zip_to',
         'state',