Keyword token cleanup