More cleaning up for release.