VID-2089 code cleanup