Shouldn't we remove the code entirely instead of commenting out? The commented code is a distraction.