#7631 remove commented code