Changes to awareness to optimize removals.  Not a great solution but getting better.