Changed behavior of instance removal