initial crypto cleanup