Working on final email cleanup