eliminate some dead code
Merge pull request #76 from anchor/wip-deadcode

eliminate some dead code