Wasn't correctly removing all expired/upgraded alerts