No more reference to GoalFrame - finally gone!