diff --git a/bastion-executor/src/blocking_pool.rs b/bastion-executor/src/blocking_pool.rs
index 8b137891..d1f3b952 100644
--- a/bastion-executor/src/blocking_pool.rs
+++ b/bastion-executor/src/blocking_pool.rs
@@ -1 +1 @@
-
+// FIXME: Blocking pool implementation goes here.
diff --git a/bastion-executor/src/pool.rs b/bastion-executor/src/pool.rs
index 54a44a3c..6970c795 100644
--- a/bastion-executor/src/pool.rs
+++ b/bastion-executor/src/pool.rs
@@ -26,6 +26,7 @@ pub struct Pool {
 impl Pool {
     /// Error recovery for the fallen threads
     pub fn recover_async_thread() {
+        // FIXME: Do recovery for fallen worker threads
         unimplemented!()
     }
 
diff --git a/bastion-executor/src/run.rs b/bastion-executor/src/run.rs
index e1145288..1a240816 100644
--- a/bastion-executor/src/run.rs
+++ b/bastion-executor/src/run.rs
@@ -31,13 +31,6 @@ where
         let _child_id = stack.get_pid();
         let _parent_id = worker::get_proc_stack(|t| t.get_pid()).unwrap_or(0);
 
-        // Wrap the future into one that drops task-local variables on exit.
-        // let future = task_local::add_finalizer(future);
-
-        let future = async move {
-            future.await;
-        };
-
         // Pin the future onto the stack.
         pin_utils::pin_mut!(future);
 
diff --git a/bastion-executor/src/thread_recovery.rs b/bastion-executor/src/thread_recovery.rs
index 8b137891..54c74c33 100644
--- a/bastion-executor/src/thread_recovery.rs
+++ b/bastion-executor/src/thread_recovery.rs
@@ -1 +1 @@
-
+// FIXME: Thread recovery for worker code will go here