Remove dependency on x.commerce