Remove previously deprecated code