More build matrix cleanup