Finalized email code/cleanup round