Alarm Refactoring -- removed alarm instance

Removed alarm instance class. Merged its functionality into alarm
candidate class