removed clear alarm option
Merge branch 'cindydev' removed clear alarm option