diff --git a/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs b/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs
index 471350e..522ab1e 100644
--- a/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs
+++ b/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 
diff --git a/programs/voter-stake-registry/src/instructions/close_voter.rs b/programs/voter-stake-registry/src/instructions/close_voter.rs
index 7ba76f3..d5d5def 100644
--- a/programs/voter-stake-registry/src/instructions/close_voter.rs
+++ b/programs/voter-stake-registry/src/instructions/close_voter.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 
diff --git a/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs b/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs
index 36f8068..d77d92f 100644
--- a/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs
+++ b/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
diff --git a/programs/voter-stake-registry/src/instructions/create_registrar.rs b/programs/voter-stake-registry/src/instructions/create_registrar.rs
index 0db6cb9..8f9edaf 100644
--- a/programs/voter-stake-registry/src/instructions/create_registrar.rs
+++ b/programs/voter-stake-registry/src/instructions/create_registrar.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use anchor_lang::prelude::*;
 use anchor_spl::token::{Mint, Token};
diff --git a/programs/voter-stake-registry/src/instructions/deposit.rs b/programs/voter-stake-registry/src/instructions/deposit.rs
index 42f6acc..a898746 100644
--- a/programs/voter-stake-registry/src/instructions/deposit.rs
+++ b/programs/voter-stake-registry/src/instructions/deposit.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
diff --git a/programs/voter-stake-registry/src/instructions/reset_lockup.rs b/programs/voter-stake-registry/src/instructions/reset_lockup.rs
index 69a126d..2d6e523 100644
--- a/programs/voter-stake-registry/src/instructions/reset_lockup.rs
+++ b/programs/voter-stake-registry/src/instructions/reset_lockup.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
diff --git a/programs/voter-stake-registry/src/instructions/set_time_offset.rs b/programs/voter-stake-registry/src/instructions/set_time_offset.rs
index f1754ab..2bd3829 100644
--- a/programs/voter-stake-registry/src/instructions/set_time_offset.rs
+++ b/programs/voter-stake-registry/src/instructions/set_time_offset.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use anchor_lang::prelude::*;
 use std::str::FromStr;
diff --git a/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs b/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs
index 2ac5caf..1df2623 100644
--- a/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs
+++ b/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs
@@ -1,6 +1,5 @@
 use crate::error::*;
 use crate::state::deposit_entry::{FIXED_VOTE_WEIGHT_FACTOR, LOCKING_VOTE_WEIGHT_FACTOR};
-use crate::state::lockup::*;
 use crate::state::registrar::Registrar;
 use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
diff --git a/programs/voter-stake-registry/src/instructions/withdraw.rs b/programs/voter-stake-registry/src/instructions/withdraw.rs
index 1b48060..cc1b7ee 100644
--- a/programs/voter-stake-registry/src/instructions/withdraw.rs
+++ b/programs/voter-stake-registry/src/instructions/withdraw.rs
@@ -1,5 +1,4 @@
 use crate::error::*;
-use crate::state::lockup::*;
 use crate::state::registrar::registrar_seeds;
 use crate::state::registrar::Registrar;
 use crate::state::voter::Voter;
diff --git a/programs/voter-stake-registry/src/state/lockup.rs b/programs/voter-stake-registry/src/state/lockup.rs
index cb049a3..bb6499a 100644
--- a/programs/voter-stake-registry/src/state/lockup.rs
+++ b/programs/voter-stake-registry/src/state/lockup.rs
@@ -1,7 +1,4 @@
 use crate::error::*;
-use crate::state::exchange_entry::ExchangeRateEntry;
-use crate::state::registrar::Registrar;
-use anchor_lang::__private::bytemuck::Zeroable;
 use anchor_lang::prelude::*;
 use anchor_spl::vote_weight_record;
 use std::convert::TryFrom;