remove "CHANGES" comments, resolve some XXXs.