VID-1678 removing unneeded code