remove more unused code (introduced in #858)
Merge pull request #861 from xabbuh/code-quality-unused

remove more unused code (introduced in #858)