removed more references to the old sender api