Removed unnecessary parsing