Crypsis cleanup