Remove default_orgname from base_state