Merge "Simplify synchronization and delete dead code."