Revert "[2/2] Notifictation counter"

This reverts commit 826968466d7f03be7c392c2ae2540ea17563c234.