Lots of clean up.