CheckoutController Cleanup