Try to clean up the build matrix