Removed dead code
Merge pull request #256 from stefk/cleanup

Removed dead code