Get rid of some legacy code.