VID-2016 code cleanup