Fixed cart settings, cleaned up duplicate.
Merge branch 'ajturner'