Remove mail support for now