Further simplification of build tasks