drop / migrate last references to Investor service