Removes unused code
Merge pull request #756 from nsendetzky/master

Removes unused code