Cleanup and changelog