Remove **old** notion of token
Minor conventions