VID-1976 code cleaunup