Remove unnecessary dependency on keystore_client