Empty billing address saved as default address if Billing Information Pane is disabled in the Checkout page

I use COD as the only payment method and only need the Delivery Address pane in the checkout. Upon submitting an order, an empty address (except the country info which is always in an address by default) always gets saved as the default address. This came from the billing address which is not displayed in my setup.

I applied the following bug fix in the uc_addresses_uc_checkout_complete function:

if (variable_get('uc_pane_billing_enabled', TRUE)) {
$address->address_name = '';
$address->uid = $order->uid;
...
_uc_addresses_db_add_address($address, TRUE);
}

Works for me. Hope this is the right way to do it. New to Ubercart and PHP for that matter.