Remove redundant parsing