Remove mail support, properly remove spout and backup support