Get rid of team and token options for client