Better build process that removes old junk