Adding more cleanup tasks on email submit