finished initial clean-up