First round of clean ups