Removing unnecessary parsing