More cleanup #27