Corrected cleanup.

And cleaned-up extraneous logs.