Update notes for submitted changes

* cleanup watchrule delete logic/tests