some git housecleaning