Todo. Change stats to only count removals that were not already expired.
Fix more todos