Fix #33 remove deprecated functionality
Merge pull request #34 from jhx/issue_33_remove_deprecated_functionality

Fix #33 remove deprecated functionality