clean-up which will hopefully cause all to be right with the world for the build