teardown enhancements