Cleanup ch2 code before starting ch3