Remove unused code, improve code coverage
Merge pull request #4 from lasso/master

Remove unused code, improve code coverage