No, we always reset the entire form state when we re-enter edit mode anyway, so no need to clean this up now.