Removal of deprecated code