switchyard v2 cart and cleanup [merge]