Removed unnecessary data model