rm deprecated code