Remove mail dependencies