remove some extra sync-ing