remove BasePartner, update Partner to match interface