8. More cleanup.