Issue 507 remove company