Remove has_scope