Move teardown to promise done