removing new completeorderpopup stuff