first part of clean up