Remove unneeded code
Merge pull request #158 from alexandernst/master

Remove unneeded code