v2 cart cleanup [merge]