Teardown and rebuild