cleanup and initial commits