Merge pull request #51 from jmlvanre/master

Removing dead code