Lots of clean-up