Removing Chapter 10 code