diff --git a/src/exchange/deposit_handler.cairo b/src/exchange/deposit_handler.cairo
index 2fa297a3..9638321d 100644
--- a/src/exchange/deposit_handler.cairo
+++ b/src/exchange/deposit_handler.cairo
@@ -156,7 +156,6 @@ mod DepositHandler {
             IRoleModule::only_controller(@state);
 
             let data_store = self.data_store.read();
-            global_reentrancy_guard::non_reentrant_before(data_store);
 
             feature_utils::validate_feature(
                 self.data_store.read(),
@@ -171,8 +170,6 @@ mod DepositHandler {
                 params
             );
 
-            global_reentrancy_guard::non_reentrant_after(data_store);
-
             key
         }
 
@@ -181,7 +178,6 @@ mod DepositHandler {
             IRoleModule::only_controller(@state);
 
             let data_store = self.data_store.read();
-            global_reentrancy_guard::non_reentrant_before(data_store);
 
             // let starting_gas = gas_left();
 
@@ -204,8 +200,6 @@ mod DepositHandler {
                 keys::user_initiated_cancel(),
                 array!['Cancel Deposit'] //TODO should be empty string
             );
-
-            global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn execute_deposit(ref self: ContractState, key: felt252, oracle_params: SetPricesParams) {
@@ -237,7 +231,7 @@ mod DepositHandler {
 
             let data_store = self.data_store.read();
             let oracle = self.oracle.read();
-            global_reentrancy_guard::non_reentrant_before(data_store);
+
             oracle_modules::with_simulated_oracle_prices_before(oracle, params);
 
             let oracleParams = Default::default();
@@ -245,7 +239,6 @@ mod DepositHandler {
             self.execute_deposit_keeper(key, oracleParams, get_caller_address());
 
             oracle_modules::with_simulated_oracle_prices_after();
-            global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn execute_deposit_keeper(
diff --git a/src/exchange/order_handler.cairo b/src/exchange/order_handler.cairo
index 11c29d64..505aa08c 100644
--- a/src/exchange/order_handler.cairo
+++ b/src/exchange/order_handler.cairo
@@ -202,8 +202,6 @@ mod OrderHandler {
             let base_order_handler_state = BaseOrderHandler::unsafe_new_contract_state();
             let data_store = base_order_handler_state.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store);
-
             // Validate feature and create order.
             feature_utils::validate_feature(
                 data_store,
@@ -218,8 +216,6 @@ mod OrderHandler {
                 params
             );
 
-            global_reentrancy_guard::non_reentrant_after(data_store);
-
             key
         }
 
@@ -241,8 +237,6 @@ mod OrderHandler {
             let data_store = base_order_handler_state.data_store.read();
             let event_emitter = base_order_handler_state.event_emitter.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store);
-
             // Validate feature.
             feature_utils::validate_feature(
                 data_store,
@@ -281,8 +275,6 @@ mod OrderHandler {
                     key, size_delta_usd, acceptable_price, trigger_price, min_output_amount
                 );
 
-            global_reentrancy_guard::non_reentrant_after(data_store);
-
             updated_order
         }
 
@@ -297,8 +289,6 @@ mod OrderHandler {
             let base_order_handler_state = BaseOrderHandler::unsafe_new_contract_state();
             let data_store = base_order_handler_state.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store);
-
             let order = data_store.get_order(key);
 
             // Validate feature.
@@ -323,8 +313,6 @@ mod OrderHandler {
                 keys::user_initiated_cancel(),
                 ArrayTrait::<felt252>::new(),
             );
-
-            global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn execute_order(ref self: ContractState, key: felt252, oracle_params: SetPricesParams) {
@@ -361,15 +349,14 @@ mod OrderHandler {
         fn simulate_execute_order(
             ref self: ContractState, key: felt252, params: SimulatePricesParams
         ) {
-            // Check only order keeper.
+            // Check only controller.
             let role_module_state = RoleModule::unsafe_new_contract_state();
-            role_module_state.only_order_keeper();
+            role_module_state.only_controller();
 
             // Fetch data store.
             let base_order_handler_state = BaseOrderHandler::unsafe_new_contract_state();
             let data_store = base_order_handler_state.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store);
             oracle_modules::with_simulated_oracle_prices_before(
                 base_order_handler_state.oracle.read(), params
             );
@@ -378,7 +365,6 @@ mod OrderHandler {
             self._execute_order(key, oracle_params, get_contract_address());
 
             oracle_modules::with_simulated_oracle_prices_after();
-            global_reentrancy_guard::non_reentrant_after(data_store);
         }
     }
 
diff --git a/src/exchange/withdrawal_handler.cairo b/src/exchange/withdrawal_handler.cairo
index d005d06a..ad9d75b2 100644
--- a/src/exchange/withdrawal_handler.cairo
+++ b/src/exchange/withdrawal_handler.cairo
@@ -148,8 +148,6 @@ mod WithdrawalHandler {
 
             let data_store = self.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store); // Initiates re-entrancy
-
             feature_utils::validate_feature(
                 data_store, keys::create_withdrawal_feature_disabled_key(get_contract_address())
             );
@@ -158,8 +156,6 @@ mod WithdrawalHandler {
                 data_store, self.event_emitter.read(), self.withdrawal_vault.read(), account, params
             );
 
-            global_reentrancy_guard::non_reentrant_after(data_store); // Finalizes re-entrancy
-
             result
         }
 
@@ -172,8 +168,6 @@ mod WithdrawalHandler {
 
             let data_store = self.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store); // Initiates re-entrancy
-
             let starting_gas = starknet_utils::sn_gasleft(array![200]); // Returns 200 for now,
             let withdrawal = data_store.get_withdrawal(key);
 
@@ -195,8 +189,6 @@ mod WithdrawalHandler {
                 keys::user_initiated_cancel(),
                 array![]
             );
-
-            global_reentrancy_guard::non_reentrant_after(data_store); // Finalizes re-entrancy
         }
 
         fn execute_withdrawal(
@@ -260,8 +252,6 @@ mod WithdrawalHandler {
 
             let data_store = self.data_store.read();
 
-            global_reentrancy_guard::non_reentrant_before(data_store); // Initiates re-entrancy
-
             let oracle_params: SetPricesParams = SetPricesParams {
                 signer_info: 0,
                 tokens: Default::default(),
@@ -279,8 +269,6 @@ mod WithdrawalHandler {
 
             self.execute_withdrawal_keeper(key, oracle_params, get_caller_address());
 
-            global_reentrancy_guard::non_reentrant_after(data_store); // Finalizes re-entrancy
-
             oracle_modules::with_simulated_oracle_prices_after();
         }
     }