Removed unnecessary data attributes