gitcherrypick - remove some cruft, fix some logic