Revert "Seperate Echo notifications"

This reverts commit 2a7837eb8c9c222ac5f5b96442d5f6286c88aa97.