Remove external tokenizer dependency
parser: cleanup