Remove unnecessary teardown