Removed unneeded parsing