diff --git a/chains/solana/contracts/programs/ccip-router/src/instructions/v1/onramp.rs b/chains/solana/contracts/programs/ccip-router/src/instructions/v1/onramp.rs
index 21b9f1152..fcc75cdc4 100644
--- a/chains/solana/contracts/programs/ccip-router/src/instructions/v1/onramp.rs
+++ b/chains/solana/contracts/programs/ccip-router/src/instructions/v1/onramp.rs
@@ -258,11 +258,11 @@ fn get_fee_cpi<'info>(
             .token_amounts
             .iter()
             .map(|x| fee_quoter::messages::SVMTokenAmount {
-                token: x.token.clone(),
+                token: x.token,
                 amount: x.amount,
             })
             .collect(),
-        fee_token: message.fee_token.clone(),
+        fee_token: message.fee_token,
         extra_args: message.extra_args.clone(),
     };
 
@@ -284,7 +284,7 @@ fn token_transfer(
 
     require!(
         extra_data_length <= CCIP_LOCK_OR_BURN_V1_RET_BYTES
-            || extra_data_length <= additional_data.dest_bytes_overhead, // TODO is this ok here?
+            || extra_data_length <= additional_data.dest_bytes_overhead,
         CcipRouterError::SourceTokenDataTooLarge
     );
 
diff --git a/chains/solana/contracts/programs/ccip-router/src/instructions/v1/pools.rs b/chains/solana/contracts/programs/ccip-router/src/instructions/v1/pools.rs
index 035cff254..bf62b350d 100644
--- a/chains/solana/contracts/programs/ccip-router/src/instructions/v1/pools.rs
+++ b/chains/solana/contracts/programs/ccip-router/src/instructions/v1/pools.rs
@@ -49,7 +49,7 @@ pub(super) struct TokenAccounts<'a> {
     pub pool_signer: &'a AccountInfo<'a>,
     pub token_program: &'a AccountInfo<'a>,
     pub mint: &'a AccountInfo<'a>,
-    pub fee_token_config: &'a AccountInfo<'a>, // TODO review this...
+    pub fee_token_config: &'a AccountInfo<'a>,
     pub remaining_accounts: &'a [AccountInfo<'a>],
 }
 
diff --git a/chains/solana/contracts/programs/ccip-router/src/state.rs b/chains/solana/contracts/programs/ccip-router/src/state.rs
index 7aa622729..ac521ceb1 100644
--- a/chains/solana/contracts/programs/ccip-router/src/state.rs
+++ b/chains/solana/contracts/programs/ccip-router/src/state.rs
@@ -16,7 +16,7 @@ pub struct Config {
 
     _padding2: [u8; 8],
     pub ocr3: [Ocr3Config; 2],
-    pub fee_quoter: Pubkey, // TODO configure this
+    pub fee_quoter: Pubkey,
 
     pub link_token_mint: Pubkey,
     pub fee_aggregator: Pubkey, // Allowed address to withdraw billed fees to (will use ATAs derived from it)
@@ -200,19 +200,6 @@ pub struct RateLimitTokenBucket {
     pub rate: u128,        // Number of tokens per second that the bucket is refilled.
 }
 
-#[derive(InitSpace, Clone, AnchorSerialize, AnchorDeserialize, Debug)]
-// TODO remove?
-pub struct BillingTokenConfig {
-    // NOTE: when modifying this struct, make sure to update the version in the wrapper
-    pub enabled: bool,
-    pub mint: Pubkey,
-
-    // price tracking
-    pub usd_per_token: TimestampedPackedU224,
-    // billing configs
-    pub premium_multiplier_wei_per_eth: u64,
-}
-
 #[derive(InitSpace, Clone, AnchorSerialize, AnchorDeserialize, Debug)]
 pub struct TimestampedPackedU224 {
     pub value: [u8; 28],