Moved #undelay in confirm to universal location