Remove unused code
Merge pull request #2 from tmn/master

Remove unused code