tokenization cleanup