Just cleaning some part of Chapter 18 and Chapter 23

I think we could delete parts conerned in this commit. :]