Removed redundant code from parsers