VID-2013 code cleanup