VID-1308 removing code