Remove more waitForIdleSyncs