VID-2079 code cleanup