Sundry commit.

1) delete some comments.
2) modify some package name.