Clean up, prepare to add tokenizer.