cleanup keyring mess part II