Revert "underp"

This reverts commit eb1d4e5da8915ae1c2d521551a6c32beb0391ff0.
Revert "removed notif count by mistake :/"

This reverts commit 7d2eaf5a9e1cfbc8b98f5daf56184da8bd24b563.