Minor fix
Remove unnecessary code.
Refine parse_statements, parse_shell_statement