More cleanup work.