Refactored Alert Cleanup; Added handling for expired/cancelled alerts;