Revert "master alarm completed & contact created & ..."

This reverts commit 4896a7760f45ca8085620385775745c0a357590c.