Issue #40 : remove dead code
Merge pull request #55 from quintonm/master

Issue #40 : remove dead code