Remove commented-out sections

These may be important if we want to submit a PR back upstream, but for
us they're just clutter.