revert: fix(Scope): aggressively clean up scope on  to minimize leaks

The commit is causing regressions.
0.1.7