diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index aa0ca1e4d..acbe5c5e7 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -1237,11 +1237,11 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
                 .arg(
                     Arg::with_name("program_location")
                         .index(1)
-                        .value_name("PATH TO PROGRAM")
+                        .value_name("PATH TO BPF PROGRAM")
                         .takes_value(true)
                         .required(true)
                         .help("/path/to/program.o"),
-                ), // TODO: Add "loader" argument; current default is bpf_loader
+                ),
         )
         .stake_subcommands()
         .storage_subcommands()
diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
index 4626dbcea..b343f428c 100644
--- a/cli/src/cluster_query.rs
+++ b/cli/src/cluster_query.rs
@@ -520,5 +520,4 @@ mod tests {
             }
         );
     }
-    // TODO: Add process tests
 }
diff --git a/cli/src/stake.rs b/cli/src/stake.rs
index 787684ad2..c04fe8c90 100644
--- a/cli/src/stake.rs
+++ b/cli/src/stake.rs
@@ -897,5 +897,4 @@ mod tests {
             }
         );
     }
-    // TODO: Add process tests
 }
diff --git a/cli/src/storage.rs b/cli/src/storage.rs
index b6ef14bde..af252337f 100644
--- a/cli/src/storage.rs
+++ b/cli/src/storage.rs
@@ -310,5 +310,4 @@ mod tests {
             }
         );
     }
-    // TODO: Add process tests
 }
diff --git a/cli/src/vote.rs b/cli/src/vote.rs
index d6a551b27..aff28047a 100644
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -593,5 +593,4 @@ mod tests {
             }
         );
     }
-    // TODO: Add process tests
 }
diff --git a/core/src/tvu.rs b/core/src/tvu.rs
index 379c19b71..9f177a3a1 100644
--- a/core/src/tvu.rs
+++ b/core/src/tvu.rs
@@ -1,16 +1,5 @@
-//! The `tvu` module implements the Transaction Validation Unit, a
-//! multi-stage transaction validation pipeline in software.
-//!
-//! 1. BlobFetchStage
-//! - Incoming blobs are picked up from the TVU sockets and repair socket.
-//! 2. RetransmitStage
-//! - Blobs are windowed until a contiguous chunk is available.  This stage also repairs and
-//! retransmits blobs that are in the queue.
-//! 3. ReplayStage
-//! - Transactions in blobs are processed and applied to the bank.
-//! - TODO We need to verify the signatures in the blobs.
-//! 4. StorageStage
-//! - Generating the keys used to encrypt the ledger and sample it for storage mining.
+//! The `tvu` module implements the Transaction Validation Unit, a multi-stage transaction
+//! validation pipeline in software.
 
 use crate::blockstream_service::BlockstreamService;
 use crate::cluster_info::ClusterInfo;
diff --git a/ledger/src/blocktree_meta.rs b/ledger/src/blocktree_meta.rs
index 6ca6dea7b..ecc15c27b 100644
--- a/ledger/src/blocktree_meta.rs
+++ b/ledger/src/blocktree_meta.rs
@@ -96,7 +96,6 @@ impl Index {
     }
 }
 
-/// TODO: Mark: Change this when coding
 impl CodingIndex {
     pub fn present_in_bounds(&self, bounds: impl RangeBounds<u64>) -> usize {
         self.index.range(bounds).count()
diff --git a/runtime/src/genesis_utils.rs b/runtime/src/genesis_utils.rs
index 6582081ec..741e8388e 100644
--- a/runtime/src/genesis_utils.rs
+++ b/runtime/src/genesis_utils.rs
@@ -27,7 +27,6 @@ pub fn create_genesis_block_with_leader(
     bootstrap_leader_pubkey: &Pubkey,
     bootstrap_leader_stake_lamports: u64,
 ) -> GenesisBlockInfo {
-    let bootstrap_leader_lamports = BOOTSTRAP_LEADER_LAMPORTS; // TODO: pass this in as an argument?
     let mint_keypair = Keypair::new();
     let voting_keypair = Keypair::new();
     let staking_keypair = Keypair::new();
@@ -57,7 +56,7 @@ pub fn create_genesis_block_with_leader(
         //  airdrops at some point to cover fees...
         (
             *bootstrap_leader_pubkey,
-            Account::new(bootstrap_leader_lamports, 0, &system_program::id()),
+            Account::new(BOOTSTRAP_LEADER_LAMPORTS, 0, &system_program::id()),
         ),
         // where votes go to
         (voting_keypair.pubkey(), vote_account),