Removes commented-out code that's unnecssary in 2.x.