Removed all token references