Cleanup, update CHANGELOG