rm deprecated functions