Start cleaning up of Chapter 4.