cleaning some of the mess