Rm deprecated methods