Removed surplus data model