Remove Crypto dependency