Remove dead code branch created by automated conversion from 2.x.
Clean up a few comments.