Remove more deprecated code.