Second round of clean-up.