Removed concept unit_type and data_type as they were unused