command/keyring: cleanup