more clean up and staging