Call order cleanup