cleanup for yubikey code