Feature/no teardown