Abandon grouping in Goal.build