Final cleanup for release.