Code cleanup for a release.