comment cleanup on 1.40 and 1.45, start ch2