Improved build process and clean up