Issue #264 - Remove commented out code.
Merge pull request #265 from davidzchen/remove-commented

Fix for #264 - Remove commented out code.