Removed dead code.
Merge pull request #263 from murrekatt/cleanup

Removed dead code.