new build
some cleanup