deprecated code cleanup