[#8336] Remove more old unused code
2 files changed