Clean up some of our messes.