Final clean up for release.