Remove dead code
Merge pull request #15 from wmde/remdead

Remove dead code