VID-1525 remove ws