Don't leave commented out code like this.  The revision history is sufficient to track changes and the reasons for them.