simplify build matrix