More cleanup.
Further cleanup.