Revert "[UPDATE] destroy based on scope"

This reverts commit fb794fbada3533935fe38ee9043064c13a8c4f45.