Cleanup and release notes work in progress