bugfix: update onRemove to correspond to recent onAdd changes