Removed dead commented out code.
Merge pull request #1570 from jfdm/fixme/code-deletion

Removed dead commented out code.