More cleanup.

Still nothing to see here.