Remove unused code - Chapter 7