clean up and initial push