revert parts of #219

Went a little overboard with the search + replace, we define #deliver in our notification classes