VID-1446 Remove extraneous code