VID-1939 removing unsed code