VID-1832 removing old comments