Added key removal tracking