Cleaning up before Chapter 10