CHANGELOG cleanups