Continued clean-up of old chapter one excercises