Pull some more unneeded code.