More cleanup during builds