cart cleanup
merged conflict yo
Merge pull request #74 from chandracarney/cartcleanup

cart cleanup