CLUB-90 clean up 1% - code now in BB