[#8336] Remove unused code
3 files changed