Lots of clean-up...