remove uncommented code
make sure we use the shipping cost provided in the message and not the recalculated one if the cost is present.