cleanup for chapter 1