remove endpoints dependence