also call self.remove_endpoint(sub) OOIION-987