remove dead code
remove dead code; improve coverage
Merge pull request #12 from yitznewton/clean

Clean