- Removed final_company field