Fixed #226

Removed commented out code from 4 files.