Remove deprecated code
Update text