removed states from alerts, notes... since I already got the helper classes