parser - removed redundant code