UAR-865 remove commented code