Added removeAllEndpoints