More teardown changes