VID-715 code cleanup