clean up and simplify build process