Cleaning up for the next release.