Removed column Unit_id, in most cases replaced by id.