Removed unneeded function from GoalStrategy, and fixed role