Removed async wait handle usage from all but keep alive call