Remove some more deprecated code.