More cleanup after losing everything earlier.