Simplify build matrix