Lots of clean up today