Cuck cleanup (31)