VID-1914 remove comment as well