More cleanup again...