VID-222 not using deprecated function