Untie the keyring and cheetah dependencies