- Removed final_company
- Removed final_company field