[#8340] repo: remove dead code, add some test coverage
3 files changed