Chapter 1 cleanup