reuse add/remove remote handling