Removed dead code.
Merge pull request #197 from murrekatt/develop

Removed dead code.