Clean up for first release.