More cleanup #55