VID-1976 code cleanup