Remove and reorder excercises to match final version of the book.