More cleanup. Ready for a release.