Get rid of the token idea