Remove yet more dead code