Further cleanup for release.