Modifying teardown