Clean up Email issues