Remove double locking
Merge pull request #163 from bitzesty/sync_improvements

Sync improvements - addresses issue #69915038 (PT)