uc_recurring_order: remove variables that just store strings as well as fixing issues #807746, #847970