Chapter 9 cleanup