Removed Goals and GoalMotor