simplified the build matrix