more git cleanup suggestions