Correct teardown steps