Merge pull request #157 from fegin/master

Clean up some outdated code and comments.