diff --git a/program/src/close.rs b/program/src/close.rs
index 4be47c0..8e7b85d 100644
--- a/program/src/close.rs
+++ b/program/src/close.rs
@@ -1,5 +1,4 @@
 use ore_api::state::Proof;
-use solana_program::system_program;
 use steel::*;
 
 /// Close closes a proof account and returns the rent to the owner.
diff --git a/program/src/initialize.rs b/program/src/initialize.rs
index 48ed85f..298e5c0 100644
--- a/program/src/initialize.rs
+++ b/program/src/initialize.rs
@@ -3,10 +3,7 @@ use ore_api::{
     instruction::*,
     state::{Bus, Config, Treasury},
 };
-use solana_program::{
-    self, account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
-    program_pack::Pack, system_program, sysvar,
-};
+use solana_program::program_pack::Pack;
 use spl_token::state::Mint;
 use steel::*;
 
diff --git a/program/src/mine.rs b/program/src/mine.rs
index 14683a1..655bb2d 100644
--- a/program/src/mine.rs
+++ b/program/src/mine.rs
@@ -16,7 +16,6 @@ use solana_program::{
     sanitize::SanitizeError,
     serialize_utils::{read_pubkey, read_u16},
     slot_hashes::SlotHash,
-    sysvar::{self, Sysvar},
 };
 use steel::*;
 
@@ -51,7 +50,7 @@ pub fn process_mine(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
     // Validate epoch is active.
     // let config_data = config_info.data.borrow();
     // let config = Config::try_from_bytes(&config_data)?;
-    let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
+    let clock = Clock::get()?;
     if config
         .last_reset_at
         .saturating_add(EPOCH_DURATION)
diff --git a/program/src/open.rs b/program/src/open.rs
index 93df2ad..2e82bd0 100644
--- a/program/src/open.rs
+++ b/program/src/open.rs
@@ -1,12 +1,7 @@
 use std::mem::size_of;
 
 use ore_api::{consts::*, instruction::Open, state::Proof};
-use solana_program::{
-    keccak::hashv,
-    slot_hashes::SlotHash,
-    system_program,
-    sysvar::{self, Sysvar},
-};
+use solana_program::{keccak::hashv, slot_hashes::SlotHash};
 use steel::*;
 
 /// Open creates a new proof account to track a miner's state.
@@ -38,7 +33,7 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
         system_program,
         payer_info,
     )?;
-    let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
+    let clock = Clock::get()?;
     let proof = proof_info.to_account_mut::<Proof>(&ore_api::ID)?;
     proof.authority = *signer_info.key;
     proof.balance = 0;
diff --git a/program/src/reset.rs b/program/src/reset.rs
index 6625f6d..e59d7f3 100644
--- a/program/src/reset.rs
+++ b/program/src/reset.rs
@@ -53,7 +53,7 @@ pub fn process_reset(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
     // Validate enough time has passed since the last reset.
     // let mut config_data = config_info.data.borrow_mut();
     // let config = Config::try_from_bytes_mut(&mut config_data)?;
-    let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
+    let clock = Clock::get()?;
     if config
         .last_reset_at
         .saturating_add(EPOCH_DURATION)
diff --git a/program/src/stake.rs b/program/src/stake.rs
index ecddd0c..48ba171 100644
--- a/program/src/stake.rs
+++ b/program/src/stake.rs
@@ -28,7 +28,7 @@ pub fn process_stake(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
     proof.balance = proof.balance.checked_add(amount).unwrap();
 
     // Update deposit timestamp.
-    let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
+    let clock = Clock::get()?;
     proof.last_stake_at = clock.unix_timestamp;
 
     // Transfer tokens from signer to treasury.