*** Removed a bunch of unused code
*** Fixed specs after code cleanup
*** Refactoring in Cart model