update to remove company-id reference