Remove more dead code