Cleanup commented out, already merged-in patches
Add changelog entry