corrected single-subscriber logic for behaviour on remove