Eliminate unneeded include, and add more comments.