mostly changes to deprecated code