[TIDOC-2009] Remove APIs not in branch