Ch2 clean-up