do WatcherSync first, and only if not syncFull. Fixes issue #414
Removed commented out code related to watcher