Cleanup of chapter 8