Remove unnessary synchronization
Fix for #860
Remove unnessary synchronization that was there for legacy
Remove unnessary synchronization that was there for legacy