VID-1972 removing unused code