Fix comment count being reduced twice

The delete comment code somehow made it into the routines twice.
Initial support for saving notifications
Clean up