Remove deprecated code

[#62818578]