Updated a new teardown method