Improved teardown