More cleaning.

Line 1358.  353 left.