Merge pull request #7527 from akx/remove-commented-out-code

Merge pull request #7527 from akx/remove-commented-out-code #3409