Cleaned up GoalBuilder.