Remove unnessary synchronization that was there for legacy