Rm deprecated things