diff --git a/app/Console/Commands/DbMapper/Bet365All.php b/app/Console/Commands/DbMapper/Bet365All.php
index fc4646ee..d6380ffc 100644
--- a/app/Console/Commands/DbMapper/Bet365All.php
+++ b/app/Console/Commands/DbMapper/Bet365All.php
@@ -72,8 +72,7 @@ class Bet365All
                         if ($arr) {
                             Event::where('id', $event->id)->update($arr);
 
-                            // XXX
-                            // Mapper::where('id', $mapper['id'])->delete();
+                            Mapper::where('id', $mapper['id'])->delete();
                         }
 
                         if ($debug) {
diff --git a/app/Console/Commands/DbMapper/LogifutureColombiaAll.php b/app/Console/Commands/DbMapper/LogifutureColombiaAll.php
index 14c359e8..b3ff07e1 100644
--- a/app/Console/Commands/DbMapper/LogifutureColombiaAll.php
+++ b/app/Console/Commands/DbMapper/LogifutureColombiaAll.php
@@ -67,8 +67,7 @@ class LogifutureColombiaAll
                     if ($arr) {
                         Event::where('id', $event->id)->update($arr);
 
-                        // XXX
-                        // Mapper::where('id', $mapper['id'])->delete();
+                        Mapper::where('id', $mapper['id'])->delete();
                     }
 
                     if ($debug) {
diff --git a/app/Console/Commands/DbMapper/LogifutureNigeriaAll.php b/app/Console/Commands/DbMapper/LogifutureNigeriaAll.php
index 652003ce..290259fc 100644
--- a/app/Console/Commands/DbMapper/LogifutureNigeriaAll.php
+++ b/app/Console/Commands/DbMapper/LogifutureNigeriaAll.php
@@ -67,8 +67,7 @@ class LogifutureNigeriaAll
                     if ($arr) {
                         Event::where('id', $event->id)->update($arr);
 
-                        // XXX
-                        // Mapper::where('id', $mapper['id'])->delete();
+                        Mapper::where('id', $mapper['id'])->delete();
                     }
 
                     if ($debug) {
diff --git a/app/Console/Commands/DbMapper/MaglooKeniaAll.php b/app/Console/Commands/DbMapper/MaglooKeniaAll.php
index 7ecefc92..f18e8ee3 100644
--- a/app/Console/Commands/DbMapper/MaglooKeniaAll.php
+++ b/app/Console/Commands/DbMapper/MaglooKeniaAll.php
@@ -74,8 +74,7 @@ class MaglooKeniaAll
                         if ($arr) {
                             Event::where('id', $event->id)->update($arr);
 
-                            // XXX
-                            // Mapper::where('id', $mapper['id'])->delete();
+                            Mapper::where('id', $mapper['id'])->delete();
                         }
 
                         if ($debug) {
diff --git a/app/Console/Commands/DbMapper/MaglooNigeriaAll.php b/app/Console/Commands/DbMapper/MaglooNigeriaAll.php
index 42c866c7..3635466c 100644
--- a/app/Console/Commands/DbMapper/MaglooNigeriaAll.php
+++ b/app/Console/Commands/DbMapper/MaglooNigeriaAll.php
@@ -70,8 +70,7 @@ class MaglooNigeriaAll
                     if ($arr) {
                         Event::where('id', $event->id)->update($arr);
 
-                        // XXX
-                        // Mapper::where('id', $mapper['id'])->delete();
+                        Mapper::where('id', $mapper['id'])->delete();
                     }
 
                     if ($debug) {
diff --git a/app/Console/Commands/Grapper/Betsapi/Bwin.php b/app/Console/Commands/Grapper/Betsapi/Bwin.php
index 3f6b4787..0fcb41a1 100644
--- a/app/Console/Commands/Grapper/Betsapi/Bwin.php
+++ b/app/Console/Commands/Grapper/Betsapi/Bwin.php
@@ -63,8 +63,8 @@ class Bwin
                             }
 
                             Event::where('betsapi_id', (int) $betsapi_id)->update(['betradar_id' => $betradar_id, 'bwin_id' => $bwin_id]);
-                            // XXX
-                            // Mapper::where('event_id', $betsapi_id)->delete();
+
+                            Mapper::where('betradar_id', $betradar_id)->delete();
                         }
                     }
                 }
diff --git a/app/Console/Commands/Grapper/Betsapi/Fixtures.php b/app/Console/Commands/Grapper/Betsapi/Fixtures.php
index c4895453..c2aa0dff 100644
--- a/app/Console/Commands/Grapper/Betsapi/Fixtures.php
+++ b/app/Console/Commands/Grapper/Betsapi/Fixtures.php
@@ -24,8 +24,7 @@ class Fixtures
         /**
          * Delete Started
          */
-        // XXX
-        // $info = Mapper::whereDate('starttime', '<', Carbon::now()->subHours(12))->delete();
+        $info = Mapper::whereDate('starttime', '<', Carbon::now()->subHours(24))->delete();
 
         if ($debug) {
             Notice::note("Deleted: $info");
diff --git a/app/Console/Commands/Grapper/Betsapi/Willhill.php b/app/Console/Commands/Grapper/Betsapi/Willhill.php
index 6598d373..f5a69725 100644
--- a/app/Console/Commands/Grapper/Betsapi/Willhill.php
+++ b/app/Console/Commands/Grapper/Betsapi/Willhill.php
@@ -100,8 +100,10 @@ class Willhill
                     $match->betsapi_id = $betsapi_id;
                     $match->bet365_id = $bet365_id;
                     $match->save();
-                    // XXX
-                    // Mapper::where('event_id', $betsapi_id)->delete();
+
+                    if ($betsapi_id) {
+                        Mapper::where('event_id', $betsapi_id)->delete();
+                    }
                 }
             }
         }
diff --git a/app/Console/Commands/Grapper/Fixtures/FindFixture.php b/app/Console/Commands/Grapper/Fixtures/FindFixture.php
index 60e7cd13..1223edd7 100644
--- a/app/Console/Commands/Grapper/Fixtures/FindFixture.php
+++ b/app/Console/Commands/Grapper/Fixtures/FindFixture.php
@@ -126,8 +126,8 @@ class FindFixture
             if (! in_array(Nuh::$options['provider_id'], [5, 6, 9])) {
                 StoreData::store($event, $match);
             }
-            // XXX
-            // Mapper::where('event_id', $event_id)->delete();
+
+            Mapper::where('event_id', $event_id)->delete();
 
             $event['id'] = $match->id;
 
diff --git a/app/Livewire/Mapper/LoadEvents.php b/app/Livewire/Mapper/LoadEvents.php
index f894c9f5..65e95a38 100644
--- a/app/Livewire/Mapper/LoadEvents.php
+++ b/app/Livewire/Mapper/LoadEvents.php
@@ -12,10 +12,10 @@ class LoadEvents
     public static function load($search_values)
     {
         $res = Event::query()->where('betradar_id', '>', 0)->pluck('betradar_id');
-        // XXX
-        // foreach ($res as $betradar_id) {
-        //     Mapper::where('betradar_id', $betradar_id)->delete();
-        // }
+
+        foreach ($res as $betradar_id) {
+            Mapper::where('betradar_id', $betradar_id)->delete();
+        }
 
         if ($search_values) {
             $element_ids = Element::where(function ($query) use ($search_values) {
diff --git a/app/Livewire/Mapper/LoadProvider.php b/app/Livewire/Mapper/LoadProvider.php
index 4f898cb7..7f4f8a25 100644
--- a/app/Livewire/Mapper/LoadProvider.php
+++ b/app/Livewire/Mapper/LoadProvider.php
@@ -12,10 +12,9 @@ class LoadProvider
 
         $res = Event::query()->where('betradar_id', '>', 0)->pluck('betradar_id');
 
-        // XXX
-        // foreach ($res as $betradar_id) {
-        //     Mapper::where('betradar_id', $betradar_id)->delete();
-        // }
+        foreach ($res as $betradar_id) {
+            Mapper::where('betradar_id', $betradar_id)->delete();
+        }
 
         if (is_array($search_values) and \count($search_values)) {
 
diff --git a/app/Livewire/Mapper/StoreMapped.php b/app/Livewire/Mapper/StoreMapped.php
index 73dee44c..219fd800 100644
--- a/app/Livewire/Mapper/StoreMapped.php
+++ b/app/Livewire/Mapper/StoreMapped.php
@@ -118,8 +118,7 @@ class StoreMapped
         if ($mapper->betradar_id) {
             $event->betradar_id = $mapper->betradar_id;
 
-            // XXX
-            // Mapper::where('id', $mapper->id)->delete();
+            Mapper::where('id', $mapper->id)->delete();
         }
         $event->save();
     }
diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php
index 338e4645..65817513 100644
--- a/app/Livewire/MapperRight.php
+++ b/app/Livewire/MapperRight.php
@@ -308,8 +308,9 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
                     ->size(Size::Small)
                     ->requiresConfirmation()
                     ->action(function (Component $livewire) {
-                        // XXX
-                        // Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->delete();
+
+                        Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->delete();
+
                         $this->search_values = [];
                         $this->tableSearch = ''; // Clears the main search bar
                         $livewire->fill(['tableSearch' => '']);