remove deprecated code
Merge pull request #859 from xabbuh/code-quality-deprecated

remove deprecated code