diff --git a/src/handler.ml b/src/handler.ml
index 55ed8336..9ffcfd56 100644
--- a/src/handler.ml
+++ b/src/handler.ml
@@ -24,6 +24,7 @@ module Respond_util = struct
 end
 
 include Respond_util
+open Syntax
 open Api
 
 let management_keys_get req server _env =
@@ -39,7 +40,6 @@ let management_keys_get req server _env =
 let management_keys_post_jsont = MasterSignatures.jsont
 
 let management_keys_post req server _env =
-  let open Syntax in
   let open Management in
   let db_conn = Vif.Server.device Devices.db_connection server in
   let sm_signkey = Vif.Server.device Devices.secmod_signkey server in
@@ -59,7 +59,6 @@ let management_keys_post req server _env =
 let management_denom_revoke_jsont = DenomRevocationSignature.jsont
 
 let management_denom_revoke req h_denom_pub server _env =
-  let open Syntax in
   let open Management in
   let db_conn = Vif.Server.device Devices.db_connection server in
   let sm_denom = Vif.Server.device Devices.secmod_denom server in
@@ -76,7 +75,6 @@ let management_denom_revoke req h_denom_pub server _env =
 let management_signkey_revoke_jsont = SignkeyRevocationSignature.jsont
 
 let management_signkey_revoke req exchange_pub server _env =
-  let open Syntax in
   let open Management in
   let db_conn = Vif.Server.device Devices.db_connection server in
   let sm_signkey = Vif.Server.device Devices.secmod_signkey server in
@@ -92,7 +90,6 @@ let management_signkey_revoke req exchange_pub server _env =
 let management_auditors_jsont = AuditorSetupMessage.jsont
 
 let management_auditors req server _env =
-  let open Syntax in
   let open Management in
   let db_conn = Vif.Server.device Devices.db_connection server in
   let res =
diff --git a/src/management.ml b/src/management.ml
index 63480e6a..4323345a 100644
--- a/src/management.ml
+++ b/src/management.ml
@@ -95,10 +95,10 @@ let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t)
     }
 
 (* - ** - *)
+open Syntax
 
 let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig }
     =
-  let open Syntax in
   let denom_hash = HashCode.to_denomination_hash h_denom_pub in
   let* denom =
     Secmod_denom.get_denoms sm_denom
@@ -128,7 +128,6 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig }
   verify ~key:Config.master_public_key master_sig r
 
 let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } =
-  let open Syntax in
   let* signkey =
     Secmod_signkey.get_signkeys sm_signkey
     |> List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key)
@@ -152,7 +151,6 @@ let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } =
 
 let verify_master_signatures ~sm_signkey ~sm_denom
     MasterSignatures.{ denom_sigs; signkey_sigs } =
-  let open Syntax in
   let* () = list_iter (verify_denom_signature ~sm_denom) denom_sigs in
   let* () = list_iter (verify_signkey_signature ~sm_signkey) signkey_sigs in
   Ok ()
@@ -161,7 +159,6 @@ let verify_master_signatures ~sm_signkey ~sm_denom
 
 (* TODO move to test *)
 let check_master_signatures_update ~db_conn ~sm_denom =
-  let open Syntax in
   Secmod_denom.get_denoms sm_denom
   |> list_iter (fun denom ->
       let error = Error "update_master_signatures sanity check failure" in
@@ -192,7 +189,6 @@ let check_master_signatures_update ~db_conn ~sm_denom =
 
 let update_master_signatures ~db_conn ~sm_signkey ~sm_denom
     MasterSignatures.{ denom_sigs; signkey_sigs } =
-  let open Syntax in
   let* () =
     signkey_sigs
     |> List.map (fun SignKeySignature.{ key; master_sig } -> (key, master_sig))
@@ -215,7 +211,6 @@ let verify_denom_revocation_sig h_denom_pub
 
 let update_denom_revocation ~db_conn ~sm_denom h_denom_pub
     DenomRevocationSignature.{ master_sig } =
-  let open Syntax in
   let* () = Secmod_denom.revoke_denomination sm_denom h_denom_pub master_sig in
   let* () =
     Pg.insert_denomination_revocation db_conn h_denom_pub master_sig
@@ -230,7 +225,6 @@ let verify_signkey_revocation_sig exchange_pub
 
 let update_signkey_revocation ~db_conn ~sm_signkey exchange_pub
     SignkeyRevocationSignature.{ master_sig } =
-  let open Syntax in
   let* () = Secmod_signkey.revoke_signkey sm_signkey exchange_pub master_sig in
   let* () =
     Pg.insert_signkey_revocation db_conn exchange_pub master_sig
@@ -255,7 +249,6 @@ let update_auditor ~db_conn
     AuditorSetupMessage.
       { auditor_url; auditor_name; auditor_pub; master_sig= _; validity_start }
     =
-  let open Syntax in
   let* last_date_opt =
     Pg.lookup_auditor_timestamp db_conn auditor_pub |> unwrap_err_caqti
   in