removed deprecated code
Merge pull request #12 from jho406/remove_deprecated_code

removed deprecated code