Remove more deprecated code