Cleanup Crypto code