[FIX] remove field in company and in code