reverted one more parser class