VID-2067 code cleaunup