Remove unneeded wait for notification message