More cleanup #2