Cleanup somewhat done.

But not all.