Third round of clean-up.