Update CHANGES.md and remove unused code.