diff --git a/nssa/src/program.rs b/nssa/src/program.rs
index 4828246..9577411 100644
--- a/nssa/src/program.rs
+++ b/nssa/src/program.rs
@@ -77,7 +77,7 @@ impl Program {
     }
 }
 
-// TODO: This is for testnet only, consider refactoring to have this not compiled for mainnet
+// TODO: Testnet only. Refactor to prevent compilation on mainnet.
 impl Program {
     pub fn pinata() -> Self {
         Self {
diff --git a/nssa/src/state.rs b/nssa/src/state.rs
index ef90f37..3fe0b93 100644
--- a/nssa/src/state.rs
+++ b/nssa/src/state.rs
@@ -8,7 +8,6 @@ use nssa_core::{
     account::Account,
     program::{DEFAULT_PROGRAM_ID, ProgramId},
 };
-use rand::{Rng, RngCore, rngs::OsRng};
 use std::collections::{HashMap, HashSet};
 
 pub(crate) struct CommitmentSet {
@@ -207,7 +206,7 @@ impl V01State {
     }
 }
 
-// TODO: This is for testnet only, consider refactoring to have this not compiled for mainnet
+// TODO: Testnet only. Refactor to prevent compilation on mainnet.
 impl V01State {
     pub fn add_pinata_program(&mut self, address: Address) {
         self.insert_program(Program::pinata());
diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
index 171dda9..0ea3892 100644
--- a/wallet/src/lib.rs
+++ b/wallet/src/lib.rs
@@ -210,7 +210,7 @@ pub enum Command {
         addr: String,
     },
 
-    // TODO: This is for testnet only, consider refactoring to have this not compiled for mainnet
+    // TODO: Testnet only. Refactor to prevent compilation on mainnet.
     // Claim piñata prize
     ClaimPinata {
         ///pinata_addr - valid 32 byte hex string