cleanup and initial import