last vestiges of getting in sync with master