Cleanup some of the Alert code