OnRemove isn't called twice anymore