Start of the lots of clean up...