Remove commented-out code (part 2)

Here are the rest of the lines.  Thanks for the speedy reviews!

Ref: #705.