Build process cleaned up and unified