update for #193: on remove & removeAll