VID-718 removing unnecessary code