Moved checks to sync task