I think we should remove commented code - we have enough already :-)