PIM-3325 : remove deprecated methods