This commented-out code seems unnecessary.
Merge pull request #2168 from katyhuff/minor_cleanup

This commented-out code seems unnecessary.