VID-1940 remove commented out code used for debugging