major cleanup for checkout payment and shipping pages