remove unnecessary has_unit kw