Remove the remaining interdependency between EDM-Next and Wave-Next