Remove unused code
Fix docblock
Merge pull request #45 from bcrowe/master

Remove unused code