start of main git cleanup