Eliminate XXX TODO in CHANGELOG