clean up AS/EAP v2 carts [merge]