Various v2 cart cleanup