removed alerts, cleanup