more thorough cleanup of tokens.