Simplify the build