Fixed up the cart and removed some unneeded code.