Remove macros from tokenizer