Removed the alert and fixed AE expired events