remove deprecated code, closes #324
Merge pull request #325 from baev/#324

remove deprecated code, closes #324