Need to remove ref to company