hammer2 - Major crypto API cleanup