Removed company mode stuff