[#8336] Remove more bits of dead code
1 file changed