VID-1986 Remove additional references to NS_VIDEO