more cleanup and shipping address fix as well to match payment address fix.