Simplify build tasks