Removed unused dependencies, and removed commented code
Merge pull request #34 from zindlerb/develop

Removed unused dependencies, and removed commented code