Remove redundant notify/await with update/awaitupdate