Remove commented out code
Merge pull request #1 from armant/master

Remove commented out code