tokenizers simplification (#6622)