Merge "Remove synchronization"