Added teardown