Remove trash
Add missing template tags
Get rid of cart types