Removed unnecessary code in parser