Remove the extra tasks.
Merge branch 'exercise-5' into exercise-6