Refactoring of alarmlist is over