remove some references to the Investor service where easy