Crypto: small cleanup