Crypsis cleanup (part 3)