use new supporters component and remove old code CLUB-1108