Crypsis cleanup (part 2)