cleanup and initial commit