Remove unnecessary data parsing