Clean-up for chapter 9