clean up emailing feature