Cleanup unnecessary code
Merge pull request #88 from rainemak/minorCleanup

Cleanup unnecessary code