More cart cleanup