more EML cleaning