hammer2 - further crypto cleanup