Alarm and stuff
Revert "Alarm and stuff"

This reverts commit 46ce91916ae28e03efa1f18629a601c6af2d0ec3.
Merge remote-tracking branch 'origin/master'