new build, and cleaning up