Lots of clean-up: