Remove unused code
Merge pull request #36 from r-e-d/master

Remove unused code