Remove more dead code.