diff --git a/programs/quarry-merge-mine/src/account_conversions.rs b/programs/quarry-merge-mine/src/account_conversions.rs
index a9fa5618..acd382ff 100644
--- a/programs/quarry-merge-mine/src/account_conversions.rs
+++ b/programs/quarry-merge-mine/src/account_conversions.rs
@@ -52,8 +52,8 @@ impl<'info> QuarryStake<'info> {
             quarry: self.quarry.to_account_info(),
             token_program: self.token_program.to_account_info(),
             rewarder: self.rewarder.to_account_info(),
-            unused_miner_vault: self.unused_account.to_account_info(),
-            unused_token_account: self.unused_account.to_account_info(),
+            unused_miner_vault: self.token_program.to_account_info(),
+            unused_token_account: self.token_program.to_account_info(),
         }
     }
 
diff --git a/programs/quarry-merge-mine/src/lib.rs b/programs/quarry-merge-mine/src/lib.rs
index 5435df1c..312deec5 100644
--- a/programs/quarry-merge-mine/src/lib.rs
+++ b/programs/quarry-merge-mine/src/lib.rs
@@ -349,11 +349,6 @@ pub struct QuarryStake<'info> {
 
     /// [quarry_mine] program.
     pub mine_program: Program<'info, quarry_mine::program::QuarryMine>,
-
-    /// Unused variable used as a filler for deprecated accounts. Handled by [quarry_mine].
-    /// One should pass in a randomly generated Keypair for this account.
-    #[account(mut)]
-    pub unused_account: UncheckedAccount<'info>,
 }
 
 /// Error Codes
diff --git a/programs/quarry-mine/src/lib.rs b/programs/quarry-mine/src/lib.rs
index 0f88bc5f..7580a2a1 100644
--- a/programs/quarry-mine/src/lib.rs
+++ b/programs/quarry-mine/src/lib.rs
@@ -783,11 +783,9 @@ pub struct UserClaim<'info> {
     pub quarry: Account<'info, Quarry>,
 
     /// Placeholder for the miner vault.
-    #[account(mut)]
     pub unused_miner_vault: UncheckedAccount<'info>,
 
     /// Placeholder for the user's staked token account.
-    #[account(mut)]
     pub unused_token_account: UncheckedAccount<'info>,
 
     /// Token program
diff --git a/programs/quarry-operator/src/lib.rs b/programs/quarry-operator/src/lib.rs
index 74741634..0d9f58ce 100644
--- a/programs/quarry-operator/src/lib.rs
+++ b/programs/quarry-operator/src/lib.rs
@@ -120,7 +120,7 @@ pub mod quarry_operator {
                     auth: ctx.accounts.with_delegate.to_auth_accounts(),
                     token_mint: ctx.accounts.token_mint.to_account_info(),
                     payer: ctx.accounts.payer.to_account_info(),
-                    unused_clock: ctx.accounts.unused_clock.to_account_info(),
+                    unused_clock: ctx.accounts.system_program.to_account_info(),
                     system_program: ctx.accounts.system_program.to_account_info(),
                 },
                 signer_seeds,