[TIDOC-2009](3_5_X) Remove APIs not in branch