Removed redudant parsing code