[PLAT-6853] remove deprecated method and patch up