remove-untested-code

### Changelog
* remove untested code