Onward with the cleaning up