Removed global variable in parser