keeping _tokenset, removing tokenset method