Removed unneeded commented-out old code, minor other touch-ups.
Removed unneeded commented-out old code, minor other touch-ups.

google-code-export/junto,google-code-export/junto,wang-xinzhi/junto,wang-xinzhi/junto