diff --git a/world-chain-builder/src/pbh/db.rs b/world-chain-builder/src/pbh/db.rs
index e2c7775..e643cac 100644
--- a/world-chain-builder/src/pbh/db.rs
+++ b/world-chain-builder/src/pbh/db.rs
@@ -2,15 +2,14 @@ use bytes::BufMut;
 use reth_db::cursor::DbCursorRW;
 use reth_db::mdbx::tx::Tx;
 use reth_db::mdbx::{DatabaseArguments, DatabaseFlags, RW};
-use reth_db::{create_db, DatabaseError};
-use std::path::Path;
-use std::sync::Arc;
-// TODO: maybe think about some sort of data retention policy for PBH transactions.
 use reth_db::table::{Compress, Decompress, Table};
 use reth_db::transaction::DbTxMut;
+use reth_db::{create_db, DatabaseError};
 use revm_primitives::{FixedBytes, B256};
 use semaphore::Field;
 use serde::{Deserialize, Serialize};
+use std::path::Path;
+use std::sync::Arc;
 use tracing::info;
 
 /// Table to store PBH validated transactions along with their nullifiers.
diff --git a/world-chain-builder/src/pool/noop.rs b/world-chain-builder/src/pool/noop.rs
index d2073ae..6aa1433 100644
--- a/world-chain-builder/src/pool/noop.rs
+++ b/world-chain-builder/src/pool/noop.rs
@@ -251,28 +251,28 @@ impl TransactionPool for NoopWorldChainTransactionPool {
         &self,
         _hashes: Vec<TxHash>,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        vec![] //TODO: implement
+        vec![]
     }
 
     fn remove_transactions_by_sender(
         &self,
         _sender: Address,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        vec![] //TODO: implement
+        vec![]
     }
 
     fn get_queued_transactions_by_sender(
         &self,
         _sender: Address,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        vec![] //TODO: implement
+        vec![]
     }
 
     fn get_pending_transactions_by_sender(
         &self,
         _sender: Address,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        vec![] //TODO: implement
+        vec![]
     }
 
     fn get_highest_consecutive_transaction_by_sender(
@@ -280,6 +280,6 @@ impl TransactionPool for NoopWorldChainTransactionPool {
         _sender: Address,
         _on_chain_nonce: u64,
     ) -> Option<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        None //TODO: implement
+        None
     }
 }