ISPN-3516 Remove deprecated API