Some clean up in task 13.