Cleanup and changes for release.