first round of clean-up