avoid deprecated code