remove reference to self in partner_goal methods