More cleanup and prep for v1 of production build.