Remove dependency to sync