Cleanup chapter 5