Moving crypto code to crypto
cleanup