clean up code CLUB-643