rm deprecated stuff