Drop some more dead code