Water quenching