wip email - cleanup