Rm deprecated code