Issue #1 - Improve shallowClear