Cleanup of task model chapter