Drop extra (custom) fields from order object, ensure cart is the same as order
Set cart status to something more realistic