Merge "Clean up synchronization"