Feature: cart improvements, remove cart