remove hard-dependency on keyring