I think we should try to have the cleaner code from start and not let commented code in the commit except for very good reasons.