Remove dead code / overlapping pattern (#9723)