VID-705 code cleanup