[3.8] Remove deprecated code