More cleanup #38