More cleanup.