Remove more deprecated code!