Updated teardown method