Remove redundant include and fix comments.