Shall we just remove commented-out code? At least we should have an explanation on why it's commented out and under what circumstances it should be uncommented.