Alarms now get fired
Clean up code