Begin to delete input_str

Delete input_str and replace it with Token List
Restore to previous code