We don't have any particular reason to unset. Clearing should be good enough, and avoid any errors using unset parameters. Cherry-picked from PR #634
We don't have any particular reason to unset. Clearing should be good enough, and avoid any errors using unset parameters. Cherry-picked from PR #634