More cleanup: