Code tidy
If order gets cancelled behind the scenes, don't clear user cart

#6524