Fixed cart delete/checkout behavior
Cleanup