VID-1979 code cleanup