diff --git a/fang_examples/asynk/simple_async_worker/src/lib.rs b/fang_examples/asynk/simple_async_worker/src/lib.rs
index 25951b3..cfd269b 100644
--- a/fang_examples/asynk/simple_async_worker/src/lib.rs
+++ b/fang_examples/asynk/simple_async_worker/src/lib.rs
@@ -1,9 +1,9 @@
 use fang::async_trait;
 use fang::asynk::async_queue::AsyncQueueable;
-use fang::asynk::async_runnable::Error;
 use fang::serde::{Deserialize, Serialize};
 use fang::typetag;
 use fang::AsyncRunnable;
+use fang::FangError;
 use std::time::Duration;
 
 #[derive(Serialize, Deserialize)]
@@ -33,7 +33,7 @@ impl MyFailingTask {
 #[async_trait]
 #[typetag::serde]
 impl AsyncRunnable for MyTask {
-    async fn run(&self, queue: &mut dyn AsyncQueueable) -> Result<(), Error> {
+    async fn run(&self, queue: &mut dyn AsyncQueueable) -> Result<(), FangError> {
         let new_task = MyTask::new(self.number + 1);
         queue
             .insert_task(&new_task as &dyn AsyncRunnable)
@@ -50,7 +50,7 @@ impl AsyncRunnable for MyTask {
 #[async_trait]
 #[typetag::serde]
 impl AsyncRunnable for MyFailingTask {
-    async fn run(&self, queue: &mut dyn AsyncQueueable) -> Result<(), Error> {
+    async fn run(&self, queue: &mut dyn AsyncQueueable) -> Result<(), FangError> {
         let new_task = MyFailingTask::new(self.number + 1);
         queue
             .insert_task(&new_task as &dyn AsyncRunnable)
diff --git a/fang_examples/asynk/simple_cron_async_worker/src/lib.rs b/fang_examples/asynk/simple_cron_async_worker/src/lib.rs
index ff102c9..2bb972b 100644
--- a/fang_examples/asynk/simple_cron_async_worker/src/lib.rs
+++ b/fang_examples/asynk/simple_cron_async_worker/src/lib.rs
@@ -1,9 +1,9 @@
 use fang::async_trait;
 use fang::asynk::async_queue::AsyncQueueable;
-use fang::asynk::async_runnable::Error;
 use fang::serde::{Deserialize, Serialize};
 use fang::typetag;
 use fang::AsyncRunnable;
+use fang::FangError;
 use fang::Scheduled;
 
 #[derive(Serialize, Deserialize)]
@@ -13,7 +13,7 @@ pub struct MyCronTask {}
 #[async_trait]
 #[typetag::serde]
 impl AsyncRunnable for MyCronTask {
-    async fn run(&self, _queue: &mut dyn AsyncQueueable) -> Result<(), Error> {
+    async fn run(&self, _queue: &mut dyn AsyncQueueable) -> Result<(), FangError> {
         log::info!("CRON!!!!!!!!!!!!!!!",);
 
         Ok(())
diff --git a/src/asynk/async_worker.rs b/src/asynk/async_worker.rs
index 97543f1..3f149c7 100644
--- a/src/asynk/async_worker.rs
+++ b/src/asynk/async_worker.rs
@@ -70,14 +70,9 @@ where
                     self.queue.fail_task(task, &error.description).await?;
                 }
             },
-            RetentionMode::RemoveAll => match result {
-                Ok(_) => {
-                    self.queue.remove_task(task.id).await?;
-                }
-                Err(_error) => {
-                    self.queue.remove_task(task.id).await?;
-                }
-            },
+            RetentionMode::RemoveAll => {
+                self.queue.remove_task(task.id).await?;
+            }
             RetentionMode::RemoveFinished => match result {
                 Ok(_) => {
                     self.queue.remove_task(task.id).await?;
diff --git a/src/blocking/worker.rs b/src/blocking/worker.rs
index 590d637..d24de14 100644
--- a/src/blocking/worker.rs
+++ b/src/blocking/worker.rs
@@ -133,10 +133,7 @@ where
             }
 
             RetentionMode::RemoveAll => {
-                match result {
-                    Ok(_) => self.queue.remove_task(task.id).unwrap(),
-                    Err(_error) => self.queue.remove_task(task.id).unwrap(),
-                };
+                self.queue.remove_task(task.id).unwrap();
             }
 
             RetentionMode::RemoveFinished => match result {