Take out syncing logic