More cleaning across the board