Cleanups and update CHANGES