Clean up across the board