Simplify cibuild