VID-1502 code cleanup